]> granicus.if.org Git - libevent/commitdiff
Merge remote branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Jan 2011 17:44:45 +0000 (12:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Jan 2011 17:44:45 +0000 (12:44 -0500)

Trivial merge