diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-08-12 10:55:10 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-08-12 10:55:10 -0400 |
| commit | 7c3c340caa167d476e368ab6e30a4174ed0bc233 (patch) | |
| tree | 3ca6e1d042c3a3f9a31595a8da355a478081e678 | |
| parent | 2608d24fd556d4b5a3bd7c9d9b47c5f442a86a3e (diff) | |
| parent | d52a5f2181f44ddb387e9d9a40523054a1f80bff (diff) | |
| download | tor-7c3c340caa167d476e368ab6e30a4174ed0bc233.tar.gz tor-7c3c340caa167d476e368ab6e30a4174ed0bc233.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 30a7e5803c..517b1164c5 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.14]) +AC_INIT([tor],[0.4.5.14-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, ["2022-08-12"], # for 0.4.5.14 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-08-12"], # for 0.4.5.14-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 c064e93780..c89d9de778 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.14" +!define VERSION "0.4.5.14-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 87b374a09d..2a46b93d9d 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.14" +#define VERSION "0.4.5.14-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR |