[tor-commits] [tor/release-0.2.5] Merge branch 'no_sslv3_023' into maint-0.2.3

[nickm at torproject.org]

commit c1c83eb376a7c89fadb01d1c7082d4aa4125333d
Merge: 0eec8e2 af73d3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 16 09:08:09 2014 -0400

    Merge branch 'no_sslv3_023' into maint-0.2.3

 changes/disable_sslv3 |    4 ++++
 src/common/tortls.c   |    4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)