From: Nick Mathewson Date: Sun, 30 Nov 2014 15:23:39 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/pr/186' X-Git-Tag: release-2.1.5-beta~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f360f89ca1e089732853463fd0bc07d95142704;p=libevent Merge remote-tracking branch 'origin/pr/186' --- 4f360f89ca1e089732853463fd0bc07d95142704