]> granicus.if.org Git - libevent/commitdiff
Merge remote branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Sun, 2 Jan 2011 05:59:20 +0000 (00:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 2 Jan 2011 05:59:20 +0000 (00:59 -0500)

Trivial merge