diff options
author | Nick Mathewson <nickm@torproject.org> | 2021-06-14 11:49:01 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2021-06-14 11:49:01 -0400 |
commit | ecc1e8eacb9945ec569291e81eacae66c95bb17e (patch) | |
tree | d94597a88f97e7e01e687bd93b18f4244c29b5df | |
parent | d0ed04d50e80fe1c1ef1bf89edebc51581a6039f (diff) | |
parent | 9085508310ab06c2b7ed0650e77dbe86023095f3 (diff) | |
download | tor-ecc1e8eacb9945ec569291e81eacae66c95bb17e.tar.gz tor-ecc1e8eacb9945ec569291e81eacae66c95bb17e.zip |
Merge branch 'maint-0.4.5' into release-0.4.5
-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 df721512fc..460154da90 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.5.9]) +AC_INIT([tor],[0.4.5.9-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-06-07"], # for 0.4.5.9 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-06-14"], # for 0.4.5.9-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 966057bab1..7e7f0fdd19 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.5.9" +!define VERSION "0.4.5.9-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 58943025d7..ffe7c65ba4 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.5.9" +#define VERSION "0.4.5.9-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |