commit 22b9caf0ae42132bc8107d990b3ebb969394c90f Merge: d315b8e 943fd4a Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 16 09:08:52 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/disable_sslv3 | 4 ++++ src/common/tortls.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-)