diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-12-05 13:33:05 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-12-05 13:33:05 -0500 |
| commit | cb51b0d55eea5802ca0917417055392d3c71ef35 (patch) | |
| tree | ffbc2ce5284811fd0098748d5b6a37ebdde69dc2 | |
| parent | 9b2d87029264e12bf8f51cd2fe2a8a092c1b489a (diff) | |
| parent | 0a33522b6268ca8936df37dab4ed622e0ff5507b (diff) | |
| download | tor-cb51b0d55eea5802ca0917417055392d3c71ef35.tar.gz tor-cb51b0d55eea5802ca0917417055392d3c71ef35.zip | |
Merge branch 'maint-0.4.2' into release-0.4.2
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a5c7b5ca12..6d2dae91a8 100644 --- 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 fb6799214e..fa0bb6b356 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.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 2456ff8aff..18f8afca7b 100644 --- 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" |