diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-11-15 08:06:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-11-15 08:06:50 -0500 |
| commit | 7f43d24e077fa36ae3d488ad8173db572a10caad (patch) | |
| tree | fdd13591297e10ad35f7952692eb19abac900722 | |
| parent | 6a490d3032fa8d368bb54bd479b61c2bcbd45c8f (diff) | |
| parent | 6d81ca845c0f99335f9620a537ebc86219b7e0c9 (diff) | |
| download | tor-7f43d24e077fa36ae3d488ad8173db572a10caad.tar.gz tor-7f43d24e077fa36ae3d488ad8173db572a10caad.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 6d7e7f4fe5..a5c7b5ca12 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]) +AC_INIT([tor],[0.4.2.4-rc-dev]) 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-12"], # for 0.4.2.4-rc +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-15"], # for 0.4.2.4-rc-dev [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 1a533dffe5..fb6799214e 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" +!define VERSION "0.4.2.4-rc-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 3d6a24ca5a..2456ff8aff 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" +#define VERSION "0.4.2.4-rc-dev" |