From: Nick Mathewson Date: Tue, 6 Dec 2011 16:02:12 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~152 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ce5053d6e6c6642b24383ff6338cf796649a78c;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 9ce5053d6e6c6642b24383ff6338cf796649a78c