From c1dd598df8972a6b7b8bdeff6a1549a7c171d7dc Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 19 Oct 2014 15:38:44 -0400 Subject: [PATCH 1/2] Note that our #13426 fix is also a #13471 fix. See also http://marc.info/?l=openssl-dev&m=141357408522028&w=2 --- changes/bug13471 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changes/bug13471 diff --git a/changes/bug13471 b/changes/bug13471 new file mode 100644 index 000000000..c116a4aee --- /dev/null +++ b/changes/bug13471 @@ -0,0 +1,5 @@ + o Major bugfixes (openssl bug workaround): + - Avoid crashing when using OpenSSL version 0.9.8zc, 1.0.0o, or + 1.0.1j, built with the 'no-ssl3' configuration option. Fixes + bug 13471. This is a workaround for an OpenSSL bug. + From e2112dd0c021fb620e90dbef3456f96635982cfc Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 20 Oct 2014 10:24:21 -0400 Subject: [PATCH 2/2] bump maint-0.2.4 to 0.2.4.25-dev --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 345601332..9cf172af4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.23]) +AC_INIT([tor],[0.2.4.25-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE