From: Nick Mathewson Date: Tue, 21 Jan 2014 19:53:47 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/pr/98' X-Git-Tag: release-2.1.4-alpha~40 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c142a7ee9fbbc9502b71ef3bd034dd908f68089;p=libevent Merge remote-tracking branch 'origin/pr/98' --- 5c142a7ee9fbbc9502b71ef3bd034dd908f68089