From: Nick Mathewson Date: Fri, 20 Dec 2013 18:37:39 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.4-alpha~68 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db7acd1310732f8240c6919a4cfb7267fcd46032;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- db7acd1310732f8240c6919a4cfb7267fcd46032