]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 22 Mar 2012 17:48:33 +0000 (13:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 22 Mar 2012 17:48:33 +0000 (13:48 -0400)

Trivial merge