diff options
author | David Goulet <dgoulet@torproject.org> | 2022-02-04 11:10:07 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2022-02-04 11:10:07 -0500 |
commit | 2bd52e2adc36a678ebd4b04ebbb7e5f00484348b (patch) | |
tree | 2ce02d9fc0659e0cd582353cd4edf32c1be02ae9 | |
parent | 8390aa1c448a89ad38b5c86f43e726295b53fdc4 (diff) | |
parent | 81a4f92b64cdb345da087abe49631ff4585cf826 (diff) | |
download | tor-2bd52e2adc36a678ebd4b04ebbb7e5f00484348b.tar.gz tor-2bd52e2adc36a678ebd4b04ebbb7e5f00484348b.zip |
Merge branch 'maint-0.4.6' into release-0.4.6
-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 2cd55798f5..58be6dd0a3 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.6.9-dev]) +AC_INIT([tor],[0.4.6.10]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # 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, ["2021-12-16"], # for 0.4.6.9-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-02-04"], # for 0.4.6.10 [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 9ac9026223..9c375a50e0 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.6.9-dev" +!define VERSION "0.4.6.10" !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 141a603e2e..890b2b7274 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.9-dev" +#define VERSION "0.4.6.10" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |