Merge branch 'patches-2.0' of github.com:libevent/libevent into patches-2.0
authorNick Mathewson <nickm@torproject.org>
Mon, 1 Dec 2014 02:02:25 +0000 (21:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 1 Dec 2014 02:02:25 +0000 (21:02 -0500)
commit1da2f42bdb7f67381e36821c27d88ec1bc8c409d
treea13ff3140b323de5289ba264a3bcd0d370399c71
parent5ae52872141c992e38401998cb82e627812bd5fa
parentbe1aeff21a7824d5113b36ebdba6d0d46477fd28
Merge branch 'patches-2.0' of github.com:libevent/libevent into patches-2.0