From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 6 Dec 2013 15:37:53 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/pr/86'
X-Git-Tag: release-2.1.4-alpha~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aeb8d345b47bee0522f1ce32a20bfc8a642d657c;p=libevent

Merge remote-tracking branch 'origin/pr/86'
---

aeb8d345b47bee0522f1ce32a20bfc8a642d657c