Merge branch 'maint-0.4.3' into release-0.4.3

This commit is contained in:
Nick Mathewson 2021-02-03 13:39:54 -05:00
commit 1c5dd021a7
3 changed files with 4 additions and 4 deletions

View File

@ -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.3.8])
AC_INIT([tor],[0.4.3.8-dev])
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-01-28"], # for 0.4.3.8
AC_DEFINE(APPROX_RELEASE_DATE, ["2021-02-03"], # for 0.4.3.8-dev
[Approximate date when this software was released. (Updated when the version changes.)])
# "foreign" means we don't follow GNU package layout standards

View File

@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
!define VERSION "0.4.3.8"
!define VERSION "0.4.3.8-dev"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"

View File

@ -217,7 +217,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
#define VERSION "0.4.3.8"
#define VERSION "0.4.3.8-dev"
#define HAVE_STRUCT_SOCKADDR_IN6
#define HAVE_STRUCT_IN6_ADDR