sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.4' into release-0.2.4 

Conflicts:
	configure.ac
This commit is contained in:
Nick Mathewson 2014-10-20 10:26:19 -04:00
parent 6b2ed1a905 e2112dd0c0
commit a8d6eb30b8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug13471 Normal file
View File

@ -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.

2
configure.ac
View File

@ -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