commit d1c6b2cf11a48db9a79a619547fdc6454b1ce271 Merge: f48def2 943fd4a Author: Nick Mathewson <nickm@torproject.org> Date: Sun Oct 19 14:36:10 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4 changes/disable_sslv3 | 4 ++++ src/common/tortls.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-)