]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 5 Dec 2013 22:14:54 +0000 (17:14 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 Dec 2013 22:14:54 +0000 (17:14 -0500)

Trivial merge