]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Nov 2011 20:35:33 +0000 (15:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Nov 2011 20:35:33 +0000 (15:35 -0500)

Trivial merge