diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-09-18 10:05:56 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-09-18 10:05:56 -0400 |
| commit | 1cd77f58e01f3463dc7d40a4d27623f6f84d11f5 (patch) | |
| tree | b448ebcd26c4ad65b9e447989d156baa850f332e | |
| parent | 6f681f5d05c24398e3e4a0de022f4b81d5bed470 (diff) | |
| parent | 99c55f52e750360f7e7cc499c162bb9fd7be23b4 (diff) | |
| download | tor-1cd77f58e01f3463dc7d40a4d27623f6f84d11f5.tar.gz tor-1cd77f58e01f3463dc7d40a4d27623f6f84d11f5.zip | |
Merge branch 'maint-0.4.8' into release-0.4.8tor-0.4.8.6
| -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 00658da6ee..ddd4bf81d2 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.5-dev]) +AC_INIT([tor],[0.4.8.6]) 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, ["2023-08-30"], # for 0.4.8.5-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2023-09-18"], # for 0.4.8.6 [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 597b464b82..df7c1ed23b 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.5-dev" +!define VERSION "0.4.8.6" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" |