[tor-commits] [tor/release-0.2.4] better release blurb, maybe. Also bump version.

[nickm at torproject.org]

commit 7ce4192d1d5c4240bf87889bf5fe44f3f5702503
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Oct 19 21:55:16 2014 -0400

    better release blurb, maybe. Also bump version.
---
 ChangeLog                |    8 ++++----
 configure.ac             |    2 +-
 contrib/tor-mingw.nsi.in |    2 +-
 src/win32/orconfig.h     |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4920ac..c3ca488 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 c05d8fd..2e1da5e 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 029b9de..1ccc1e7 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 d9e4dab..c866bbb 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"