From: Nick Mathewson Date: Thu, 20 Oct 2011 02:44:33 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~178 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=128c8d6c0f684b95a98358805eb91e1384dcb050;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 128c8d6c0f684b95a98358805eb91e1384dcb050