aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-10-19 21:55:16 -0400
committerNick Mathewson <nickm@torproject.org>2014-10-19 21:55:21 -0400
commit7ce4192d1d5c4240bf87889bf5fe44f3f5702503 (patch)
treee424cf824759e050237879393baa9c97aa1d951b
parentb783ed3b5ca1e2682542e92119cb50b01e877709 (diff)
downloadtor-7ce4192d1d5c4240bf87889bf5fe44f3f5702503.tar.gz
tor-7ce4192d1d5c4240bf87889bf5fe44f3f5702503.zip
better release blurb, maybe. Also bump version.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
-rw-r--r--contrib/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b4920ac1f2..c3ca4885b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
Changes in version 0.2.4.25 - 2014-10-20
- Tor 0.2.4.25 contains a response to the recent "POODLE" attack against
- SSL3 (which doesn't affect Tor), and a response to a crash bug caused
- by some operating systems' response to the "POODLE" attack (which does
- affect Tor).
+ Tor 0.2.4.25 disables SSL3 in response to the recent "POODLE" attack
+ (even though POODLE does not affect Tor). It also works around a crash
+ bug caused by some operating systems' response to the "POODLE" attack
+ (which does affect Tor).
o Major security fixes (also in 0.2.5.9-rc):
- Disable support for SSLv3. All versions of OpenSSL in use with Tor
diff --git a/configure.ac b/configure.ac
index c05d8fd907..2e1da5e15b 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.24])
+AC_INIT([tor],[0.2.4.25])
AC_CONFIG_SRCDIR([src/or/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 029b9deb9a..1ccc1e728b 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.2.4.24"
+!define VERSION "0.2.4.25"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index d9e4dab27f..c866bbb2c8 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.4.24"
+#define VERSION "0.2.4.25"