From: Nick Mathewson Date: Thu, 21 Apr 2011 17:38:29 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~294 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=169eca7b58c0031c795b4f443fcccb3cdaac5b98;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 169eca7b58c0031c795b4f443fcccb3cdaac5b98