diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-11-09 17:14:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-11-09 17:14:58 -0500 |
| commit | c142045be26a527059112d34e06a12796ba6b204 (patch) | |
| tree | 25e23485cae0dab61e5a53f8b8d4c908b7ea3025 | |
| parent | 328078c3a0c21bfb7a1994095ffe5e0d3da03bea (diff) | |
| parent | 3d3dc08ed8782e88f1e87a9550b9f18751c5732a (diff) | |
| download | tor-c142045be26a527059112d34e06a12796ba6b204.tar.gz tor-c142045be26a527059112d34e06a12796ba6b204.zip | |
Merge branch 'maint-0.4.3' into release-0.4.3
| -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 e28f957d03..61cdaff8e6 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.3.6-dev]) +AC_INIT([tor],[0.4.3.7]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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-07-09"], # for 0.4.3.6-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-09"], # for 0.4.3.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 f1de58e70f..9b66743ce7 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.3.6-dev" +!define VERSION "0.4.3.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 ee203da680..562d6e77c7 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.3.6-dev" +#define VERSION "0.4.3.7" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |