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