]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2011 15:45:43 +0000 (11:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2011 15:45:43 +0000 (11:45 -0400)

Trivial merge