diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-04-09 08:39:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-04-09 08:39:16 -0400 |
| commit | b5e0abe18604e1f73ba9a709d505f15fbb9a5f90 (patch) | |
| tree | 40c3211f049a7225ad9cd268bf8547e263814168 | |
| parent | 7aa1e9b61b07324ff370ef0875d0d4a3bb821520 (diff) | |
| parent | bfea7a7326143702e688d9bd8cccedde69a45bb6 (diff) | |
| download | tor-b5e0abe18604e1f73ba9a709d505f15fbb9a5f90.tar.gz tor-b5e0abe18604e1f73ba9a709d505f15fbb9a5f90.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 5af9d9862e..d561f2da66 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.3-alpha]) +AC_INIT([tor],[0.4.3.4-rc]) 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-03-10"], # for 0.4.3.3-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-04-09"], # for 0.4.3.4-rc [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 b3328133b6..0779a426fb 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.3-alpha" +!define VERSION "0.4.3.4-rc" !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 47ca863ce8..47876c09e5 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.3-alpha" +#define VERSION "0.4.3.4-rc" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |