From: Nick Mathewson Date: Fri, 18 Nov 2011 20:35:33 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~158 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3596a31d6376f2ac0740d37f9fdc27f0b4a2f76d;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 3596a31d6376f2ac0740d37f9fdc27f0b4a2f76d