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

commit f77d8901fc6e3836a2ef6e1ee58004dfb0546675 Merge: a64f3ab ab4b296 Author: Nick Mathewson nickm@torproject.org Date: Sun Oct 19 11:13:09 2014 -0400

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

changes/13295 | 5 +++++ changes/bug13325 | 4 ++++ changes/bug8093 | 3 +++ changes/disable_sslv3 | 4 ++++ configure.ac | 4 ++++ src/common/sandbox.c | 21 +++++++++++++++++++ src/common/sandbox.h | 2 ++ src/common/tortls.c | 52 +++++++++++++++++++++++++++++++++++++---------- src/or/relay.c | 2 +- src/tools/tor-resolve.c | 2 ++ 10 files changed, 87 insertions(+), 12 deletions(-)