[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

[nickm at torproject.org]

commit 33b399a7b2ecc1ea13219fde86748246d697f6fe
Merge: 48af23e 22b9caf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 16 09:09:20 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.5'

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