From: Nick Mathewson Date: Tue, 24 Jan 2012 22:18:52 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~122 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c6b3246fd9e3a3fa4f1a4b0126f0fc1e07d628c;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 2c6b3246fd9e3a3fa4f1a4b0126f0fc1e07d628c