[tor-commits] [tor/release-0.2.5] Add a release blurb and increment the version in the changelog.

[nickm at torproject.org]

commit 76f72e3b41c7d4e149ec1a353de1f62048c4b234
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 11 11:33:36 2014 -0400

    Add a release blurb and increment the version in the changelog.
    
    (Remember, this isn't the final release until it's tagged.)
---
 ChangeLog                           |    7 ++++++-
 configure.ac                        |    2 +-
 contrib/win32build/tor-mingw.nsi.in |    2 +-
 src/win32/orconfig.h                |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16df957..12fb2e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-Changes in version 0.2.5.7-rc - 2014-09-1x
+Changes in version 0.2.5.7-rc - 2014-09-11
+  Tor 0.2.5.7-rc fixes several regressions from earlier in the 0.2.5.x
+  release series, and some long-standing bugs related to ORPort reachability
+  testing and failure to send CREATE cells.  It is the first release
+  candidate for 0.2.5.7-rc.
+
   o Major bugfixes (client, startup):
     - Start making circuits as soon as DisabledNetwork is turned off.
       When Tor started with DisabledNetwork set, it would correctly
diff --git a/configure.ac b/configure.ac
index c37f154..97a7a33 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.6-alpha])
+AC_INIT([tor],[0.2.5.7-rc])
 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 5d94fd9..51297a7 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.6-alpha"
+!define VERSION "0.2.5.7-rc"
 !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 9873955..7f6745b 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.6-alpha"
+#define VERSION "0.2.5.7-rc"