]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 28 Apr 2011 01:28:32 +0000 (21:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 28 Apr 2011 01:28:32 +0000 (21:28 -0400)

Trivial merge