From: Nick Mathewson Date: Thu, 28 Apr 2011 00:07:13 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~288 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c2ef970c31de29d2283be69cb972d7c5fdc092b;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 6c2ef970c31de29d2283be69cb972d7c5fdc092b