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

Trivial merge