]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'no_sslv3_023' into maint-0.2.3
authorNick Mathewson <nickm@torproject.org>
Thu, 16 Oct 2014 13:08:09 +0000 (09:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 16 Oct 2014 13:08:09 +0000 (09:08 -0400)

Trivial merge