]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'github/20_addfile_ssl' into patches-2.0
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Oct 2011 19:11:50 +0000 (15:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Oct 2011 19:11:50 +0000 (15:11 -0400)

Trivial merge