]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'ppelleti/windows-ssl'
authorNick Mathewson <nickm@torproject.org>
Tue, 31 Jul 2012 16:03:48 +0000 (12:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 31 Jul 2012 16:03:48 +0000 (12:03 -0400)

Trivial merge