]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Sat, 11 Feb 2012 03:18:19 +0000 (22:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 11 Feb 2012 03:18:19 +0000 (22:18 -0500)

Trivial merge