aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2023-12-08 13:49:19 -0500
committerDavid Goulet <dgoulet@torproject.org>2023-12-08 13:49:19 -0500
commit680415826c5fd7862e65eeeefe0d98b905714f83 (patch)
tree58345f40010490722d77d37090c4ee32efa163fc
parentc4f75f49f21330050388dfd2daec7bf69609ba5a (diff)
parente759de90a57900eb845fc82196988b501cd2aacb (diff)
downloadtor-680415826c5fd7862e65eeeefe0d98b905714f83.tar.gz
tor-680415826c5fd7862e65eeeefe0d98b905714f83.zip
Merge branch 'maint-0.4.8' into release-0.4.8tor-0.4.8.10
-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 4ad906419f..3e0d42d358 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.9-dev])
+AC_INIT([tor],[0.4.8.10])
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-11-09"], # for 0.4.8.9-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2023-12-08"], # for 0.4.8.10
[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 b145b09d21..9295e88196 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.9-dev"
+!define VERSION "0.4.8.10"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"