From: Nick Mathewson Date: Sun, 9 Feb 2014 18:35:21 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.4-alpha~30 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49efac5356ca4eea4b7e6ef9bf1160bba25cfcde;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 49efac5356ca4eea4b7e6ef9bf1160bba25cfcde