]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Jul 2011 14:20:58 +0000 (10:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Jul 2011 14:20:58 +0000 (10:20 -0400)

Trivial merge