]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 1 Dec 2014 13:32:23 +0000 (08:32 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 1 Dec 2014 13:32:23 +0000 (08:32 -0500)

Trivial merge