]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'resetius/https'
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Dec 2013 17:45:22 +0000 (12:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Dec 2013 17:45:22 +0000 (12:45 -0500)

Trivial merge