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 | 247dbf891f98b44b35062b871338bbe6efaf3c2b (patch) | |
| tree | c40bfa349a53faf568c512210006d1c07265a8b6 | |
| parent | cee30117cd9241da8a55a1b7241525a779ff3fbd (diff) | |
| parent | 8933c7908d9d894f50d46c7962457fa512190e1b (diff) | |
| download | tor-247dbf891f98b44b35062b871338bbe6efaf3c2b.tar.gz tor-247dbf891f98b44b35062b871338bbe6efaf3c2b.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 7bdd195e67..3725235e01 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.6-dev]) +AC_INIT([tor],[0.4.1.7]) 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-09-19"], # for 0.4.1.6-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.1.7 [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 32f7692f11..c3c14186d9 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.6-dev" +!define VERSION "0.4.1.7" !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 78370ae0a7..cbf6217ddd 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.6-dev" +#define VERSION "0.4.1.7" |