From: Nick Mathewson Date: Mon, 1 Dec 2014 00:25:21 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/pr/180' X-Git-Tag: release-2.1.5-beta~13 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23133cacc841e3e5b226de8b4ab39ad2eab68317;p=libevent Merge remote-tracking branch 'origin/pr/180' --- 23133cacc841e3e5b226de8b4ab39ad2eab68317