diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-09 10:32:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-09 10:32:39 -0400 |
| commit | 30711296fd5b7f51ef6f4d7b3fbe20f12990c02c (patch) | |
| tree | 950d4ccbd5f370db409809d102692a2c43d7dbd6 | |
| parent | 412546c4816104523f12dd76500b0eed7132bd2a (diff) | |
| parent | 7ba849349a29bfb07e23180483cd490f93e7a1f7 (diff) | |
| download | tor-30711296fd5b7f51ef6f4d7b3fbe20f12990c02c.tar.gz tor-30711296fd5b7f51ef6f4d7b3fbe20f12990c02c.zip | |
Merge branch 'maint-0.4.3' into release-0.4.3tor-0.4.3.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 5fbf22bd11..a7c7c06fff 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.5-dev]) +AC_INIT([tor],[0.4.3.6]) 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-05-15"], # for 0.4.3.5-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.3.6 [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 efb64327f1..7f2242c95b 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.5-dev" +!define VERSION "0.4.3.6" !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 9e18ee9fa6..886c479253 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.5-dev" +#define VERSION "0.4.3.6" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |