From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 May 2013 14:03:28 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.4-alpha~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef820dbfb376a2cc4797fcd80d1f6d4a11d1f48c;p=libevent

Merge remote-tracking branch 'origin/patches-2.0'
---

ef820dbfb376a2cc4797fcd80d1f6d4a11d1f48c