diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-08-30 13:36:02 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-08-30 13:36:02 -0400 |
| commit | 58476ea8bfbf7daf3e7871b793f4704c347e2481 (patch) | |
| tree | dc5fc7166364b12cc47d5315fb5a3b8e159e1a5e | |
| parent | 4fc1bb3e86b263aa174d8f70909fa0f4f51a922c (diff) | |
| parent | 89148fbffe9f7c6ff207bff4ee065df901e4405c (diff) | |
| download | tor-58476ea8bfbf7daf3e7871b793f4704c347e2481.tar.gz tor-58476ea8bfbf7daf3e7871b793f4704c347e2481.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 a76e685676..00658da6ee 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]) +AC_INIT([tor],[0.4.8.5-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, ["2023-08-30"], # for 0.4.8.5 +AC_DEFINE(APPROX_RELEASE_DATE, ["2023-08-30"], # for 0.4.8.5-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 791622373b..597b464b82 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" +!define VERSION "0.4.8.5-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" |