I plan to release Tor 0.2.5.10 tomorrow.

5 files changed, 20 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a8506a2a71..3040a6a168 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Changes in version 0.2.5.10 - 2014-10-24
+  Tor 0.2.5.10 is the first stable release in the 0.2.5 series.
+
+  It adds several new security features, including improved DoS
+  resistance for relays, new compiler hardening options, and a
+  system-call sandbox for hardened installations on Linux (requires
+  seccomp2). The controller protocol has several new features, resolving
+  IPv6 addresses should work better than before, and relays should be a
+  little more CPU-efficient. We've added support for more (Open,Free)BSD
+  transparent proxy types. We've improved the build system and testing
+  intrastructure to allow unit testing of more parts of the Tor
+  codebase. Finally, we've addressed several nagging pluggable transport
+  usability issues, and included numerous other small bugfixes and
+  features mentioned below.
+
+
 Changes in version 0.2.5.9-rc - 2014-10-20
   Tor 0.2.5.9-rc is the third release candidate for the Tor 0.2.5.x
   series. It disables SSL3 in response to the recent "POODLE" attack
diff --git a/ReleaseNotes b/ReleaseNotes
index fd1e7284c6..4a7ee3bb36 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,7 +2,7 @@ This document summarizes new features and bugfixes in each stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
-Changes in version 0.2.5.10 - 2014-10-xx
+Changes in version 0.2.5.10 - 2014-10-24
   Tor 0.2.5.10 is the first stable release in the 0.2.5 series.
 
   It adds several new security features, including improved DoS
diff --git a/configure.ac b/configure.ac
index 4b98b9cfd1..332e093b47 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.5.9-rc-dev])
+AC_INIT([tor],[0.2.5.10])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index 88116ec850..9610ac5288 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.5.9-rc-dev"
+!define VERSION "0.2.5.10"
 !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 2c2ff7eb16..4e48598775 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.5.9-rc-dev"
+#define VERSION "0.2.5.10"