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