summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2023-11-03 09:29:01 -0400
committerDavid Goulet <dgoulet@torproject.org>2023-11-03 09:29:01 -0400
commitab50fb1f316e5be814a9307ce773da550f44681c (patch)
tree51ddd9ae6cc612229f8a982c503e316e2cbf53ca
parent5d2a6149d4bc9ab32fde2d315e3eb7e8379c8add (diff)
parentf15408f487903a5844746f7569f8713c8f567a9a (diff)
downloadtor-ab50fb1f316e5be814a9307ce773da550f44681c.tar.gz
tor-ab50fb1f316e5be814a9307ce773da550f44681c.zip
Merge branch 'maint-0.4.8' into release-0.4.8
-rw-r--r--configure.ac4
-rw-r--r--contrib/win32build/tor-mingw.nsi.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 2a230d4892..544d7593dc 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.8-dev])
+AC_INIT([tor],[0.4.8.8])
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-09-25"], # for 0.4.8.8-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2023-11-03"], # for 0.4.8.8
[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 022e383baf..f0072c4b48 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.8-dev"
+!define VERSION "0.4.8.8"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"