diff options
| author | David Goulet <dgoulet@torproject.org> | 2024-04-10 15:48:05 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2024-04-10 15:48:05 -0400 |
| commit | caa2ddaa8dc1f4f3852a678d4bbcb31f7664d461 (patch) | |
| tree | f7233604a0e9d7678c98732eb70254eaa1253bff | |
| parent | cc3037ba77f6c0e4daa3516c4427e48882b511b2 (diff) | |
| parent | 6ebf4360840b173b92fcdb14ce22bd326cea652f (diff) | |
| download | tor-caa2ddaa8dc1f4f3852a678d4bbcb31f7664d461.tar.gz tor-caa2ddaa8dc1f4f3852a678d4bbcb31f7664d461.zip | |
Merge branch 'maint-0.4.8' into release-0.4.8
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 9dc9f1b6ea..f19904c013 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.8.11]) +AC_INIT([tor],[0.4.8.11-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # 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, ["2024-04-10"], # for 0.4.8.11 +AC_DEFINE(APPROX_RELEASE_DATE, ["2024-04-10"], # for 0.4.8.11-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 e3a1a31d59..e77270e829 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.8.11" +!define VERSION "0.4.8.11-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" |