]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0' release-2.1.1-alpha
authorNick Mathewson <nickm@torproject.org>
Tue, 3 Apr 2012 22:39:30 +0000 (18:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 3 Apr 2012 22:39:30 +0000 (18:39 -0400)

Trivial merge