[tor-commits] [tor/release-0.2.5] Adjust 0.2.5.13 changelog entry from 0.3.0.4-rc to match

[nickm at torproject.org]

commit 8e0bf7fac15a6ef898b7ce319e323cdcd9b36a90
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 10:05:50 2017 -0500

    Adjust 0.2.5.13 changelog entry from 0.3.0.4-rc to match
---
 ChangeLog                           | 15 +++++++--------
 configure.ac                        |  2 +-
 contrib/win32build/tor-mingw.nsi.in |  2 +-
 src/win32/orconfig.h                |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca5abb3..b194668 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,14 +111,13 @@ Changes in version 0.2.5.13 - 2017-03-??
       0.2.1.10-alpha. Found by Yuan Jochen Kang, Suman Jana, and
       Baishakhi Ray.
 
-  o Major bugfixes (parsing, also in 0.3.0.4-rc):
-    - Fix an integer underflow bug when comparing malformed Tor versions.
-      This bug is harmless, except when Tor has been built with
-      --enable-expensive-hardening, which would turn it into a crash;
-      or on Tor 0.2.9.1-alpha through Tor 0.2.9.8, which were built with
-      -ftrapv by default.
-      Part of TROVE-2017-001. Fixes bug 21278; bugfix on
-      0.0.8pre1. Found by OSS-Fuzz.
+  o Major bugfixes (parsing, backported from 0.3.0.4-rc):
+    - Fix an integer underflow bug when comparing malformed Tor
+      versions. This bug could crash Tor when built with
+      --enable-expensive-hardening, or on Tor 0.2.9.1-alpha through Tor
+      0.2.9.8, which were built with -ftrapv by default. In other cases
+      it was harmless. Part of TROVE-2017-001. Fixes bug 21278; bugfix
+      on 0.0.8pre1. Found by OSS-Fuzz.
 
 
 
diff --git a/configure.ac b/configure.ac
index 29ba2fd..443cb56 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.12])
+AC_INIT([tor],[0.2.5.12-dev])
 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 2fb15b8..ba53353 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.12"
+!define VERSION "0.2.5.12-dev"
 !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 6d6cde4..89ac13f 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.12"
+#define VERSION "0.2.5.12-dev"