diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-02-03 13:39:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-02-03 13:39:54 -0500 |
| commit | 1c5dd021a7666806284b851ecb1879704df8020e (patch) | |
| tree | 777a7bf6cf14f7cbbe6f87f97dfd93258882ceef | |
| parent | 52320916168e84903f26cee7db9d6f2bf16714d5 (diff) | |
| parent | 8a17999da3626a5f9e8922277151624cd0526fba (diff) | |
| download | tor-release-0.4.3.tar.gz tor-release-0.4.3.zip | |
Merge branch 'maint-0.4.3' into release-0.4.3release-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 eb5a038541..64e4984783 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.8]) +AC_INIT([tor],[0.4.3.8-dev]) 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, ["2021-01-28"], # for 0.4.3.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-02-03"], # for 0.4.3.8-dev [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 347b781116..95bf00d04a 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.8" +!define VERSION "0.4.3.8-dev" !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 ed85c09a71..85cb588923 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.8" +#define VERSION "0.4.3.8-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |