From: Nick Mathewson Date: Tue, 6 Dec 2011 18:38:40 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~151 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=748a0d27948c8c7efd8c3b809a5d020ca1a9da35;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 748a0d27948c8c7efd8c3b809a5d020ca1a9da35