diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-20 10:26:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-20 10:26:19 -0400 |
| commit | a8d6eb30b88ec56e2bdef9d8a12ff308fa0223b5 (patch) | |
| tree | a544c62ff8b782f589c90a22860cafbea57ad683 | |
| parent | 6b2ed1a905ce2ca50a480d319368b676de124d6d (diff) | |
| parent | e2112dd0c021fb620e90dbef3456f96635982cfc (diff) | |
| download | tor-a8d6eb30b88ec56e2bdef9d8a12ff308fa0223b5.tar.gz tor-a8d6eb30b88ec56e2bdef9d8a12ff308fa0223b5.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4
Conflicts:
configure.ac
| -rw-r--r-- | changes/bug13471 | 5 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug13471 b/changes/bug13471 new file mode 100644 index 0000000000..c116a4aeeb --- /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. + diff --git a/configure.ac b/configure.ac index 2e1da5e15b..9cf172af44 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.25]) +AC_INIT([tor],[0.2.4.25-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE |