From: Nick Mathewson Date: Tue, 21 Jun 2011 14:07:04 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~248 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=722207ff9e8b4ff06b2b3cc166294ca2e2340e50;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 722207ff9e8b4ff06b2b3cc166294ca2e2340e50