diff options
| author | David Goulet <dgoulet@torproject.org> | 2024-10-24 10:58:55 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2024-10-24 10:58:55 -0400 |
| commit | 3a7231fcc474793c34efee7d888f79e1f580e899 (patch) | |
| tree | 9eafd2502ac3a6f0df2f380a9ecce79019be9288 | |
| parent | e153e72c01315f86c1df36cecfa1790779a3adb4 (diff) | |
| parent | 20b075eea82dbdc875b76e0b9a97ec85406c3790 (diff) | |
| download | tor-3a7231fcc474793c34efee7d888f79e1f580e899.tar.gz tor-3a7231fcc474793c34efee7d888f79e1f580e899.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 f01eed42ce..4c0b97a5b2 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.13]) +AC_INIT([tor],[0.4.8.13-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-10-24"], # for 0.4.8.13 +AC_DEFINE(APPROX_RELEASE_DATE, ["2024-10-24"], # for 0.4.8.13-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 69568880f0..7532a17c2e 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.13" +!define VERSION "0.4.8.13-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" |