]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Jul 2011 03:38:23 +0000 (23:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Jul 2011 03:38:23 +0000 (23:38 -0400)

Trivial merge