diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-29 19:44:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-29 19:44:48 -0500 |
| commit | 3090839168377f17998cd9c4b7321aab7d9286c8 (patch) | |
| tree | e459a8e8e6c7a5f8e2a4d33ffa4497dcb493f6fc | |
| parent | d211b20fbf80c03818d99e99d68e5ae8a3884295 (diff) | |
| parent | ec7f99e6ef23f05d8fea4b8b63cc4f5ecc92eb33 (diff) | |
| download | tor-3090839168377f17998cd9c4b7321aab7d9286c8.tar.gz tor-3090839168377f17998cd9c4b7321aab7d9286c8.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 9e31b3bd61..82e3f57f43 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.7-dev]) +AC_INIT([tor],[0.4.1.8]) 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-12-09"], # for 0.4.1.7-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.1.8 [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 b50746779a..dfd8a1e0a1 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.7-dev" +!define VERSION "0.4.1.8" !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 dccf731548..50a588e314 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.7-dev" +#define VERSION "0.4.1.8" |