]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Nov 2012 15:58:04 +0000 (10:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Nov 2012 15:58:04 +0000 (10:58 -0500)

Trivial merge