aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2021-06-07 13:32:35 -0400
committerNick Mathewson <nickm@torproject.org>2021-06-07 13:32:35 -0400
commitbffba45796f4d4521c817e995d1f6055d9fef43a (patch)
tree3891f1b3ad329ed379753637a56ed0e34b42e6db
parentf66fa8eba58bb0d646e74923993ba4ebf79e4df5 (diff)
parent1956f63d6b9357d6dc6375784fd6fea8551a7d61 (diff)
downloadtor-bffba45796f4d4521c817e995d1f6055d9fef43a.tar.gz
tor-bffba45796f4d4521c817e995d1f6055d9fef43a.zip
Merge branch 'maint-0.4.4' into release-0.4.4
-rw-r--r--configure.ac4
-rw-r--r--contrib/win32build/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 9ee5dd181a..1527d580b0 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.4.8-dev])
+AC_INIT([tor],[0.4.4.9])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
@@ -16,7 +16,7 @@ configure_flags="$*"
# 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, ["2021-03-16"], # for 0.4.4.8-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-06-07"], # for 0.4.4.9
[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 38046e7c5d..151127df7f 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.4.8-dev"
+!define VERSION "0.4.4.9"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 1f6284727b..b26aac0fa4 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.4.4.8-dev"
+#define VERSION "0.4.4.9"
#define HAVE_STRUCT_SOCKADDR_IN6
#define HAVE_STRUCT_IN6_ADDR