]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Oct 2011 04:21:29 +0000 (00:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Oct 2011 04:21:29 +0000 (00:21 -0400)

Trivial merge