diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-18 12:18:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-18 12:18:31 -0400 |
| commit | e05304902c616c41b9520e2b7730e399401b68fe (patch) | |
| tree | 301dc2048d37a16b2a385f7dc130db3735bd12a4 | |
| parent | 93ed011a26757b71630e7b61aee947337f6d4b0b (diff) | |
| parent | cb69a5a1184e1b02523308c6d51b0f8f715f064e (diff) | |
| download | tor-e05304902c616c41b9520e2b7730e399401b68fe.tar.gz tor-e05304902c616c41b9520e2b7730e399401b68fe.zip | |
Merge branch 'maint-0.4.1' into release-0.4.1
| -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 1d6b8ee153..628811e53e 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.1.9]) +AC_INIT([tor],[0.4.1.9-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, ["2020-03-13"], # for 0.4.1.9 +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-18"], # for 0.4.1.9-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 01f5a57401..0de3d09546 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.1.9" +!define VERSION "0.4.1.9-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 9e5d1d47c6..efd898681f 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.1.9" +#define VERSION "0.4.1.9-dev" |