]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Sun, 18 Nov 2012 06:44:09 +0000 (01:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 18 Nov 2012 06:44:09 +0000 (01:44 -0500)

Trivial merge