Merge branch 'no_sslv3_023' into maint-0.2.3
commitc1c83eb376a7c89fadb01d1c7082d4aa4125333d
authorNick Mathewson <nickm@torproject.org>
Thu, 16 Oct 2014 13:08:09 +0000 (16 09:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 16 Oct 2014 13:08:09 +0000 (16 09:08 -0400)
tree8c5357ad0e16ca6fb3f3f78c285627efd1c7b7dc
parent0eec8e2aa51f779e458fb3831b0ed8ae1db896ec
parentaf73d3e4d83ba7f404068008ad617e02b8a0a77b
Merge branch 'no_sslv3_023' into maint-0.2.3