]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2013 19:17:34 +0000 (15:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2013 19:17:34 +0000 (15:17 -0400)

Trivial merge