From: Nick Mathewson Date: Wed, 1 Jun 2011 17:52:27 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~261 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36f745df225e5d110365a360aa7bfe63e66a1ce3;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 36f745df225e5d110365a360aa7bfe63e66a1ce3