Bump to 0.4.2.5

diff --git a/configure.ac b/configure.ac
index a5c7b5ca12e4042285df4c1e7adeee801974f3b2..6d2dae91a87da0e5f43029a047276b72e6f76b8b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.4-rc-dev])
+AC_INIT([tor],[0.4.2.5])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-15"], # for 0.4.2.4-rc-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.2.5
           [Approximate date when this software was released. (Updated when the version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards

diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index fb6799214ee8fae46863665ecbfc54d834301065..fa0bb6b35683213300d2bca769e1cf891de0ef11 100644 (file)
--- 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.4.2.4-rc-dev"
+!define VERSION "0.4.2.5"
 !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 2456ff8aff5ca3126baf8bcc3afba2d92c521497..18f8afca7b8c9685a3e0f8c2bf58b8b2788b27ef 100644 (file)
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.4-rc-dev"
+#define VERSION "0.4.2.5"