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

Trivial merge