nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.3' into release-0.4.3

Browse Source
This commit is contained in:
Nick Mathewson 2020-11-09 17:14:58 -05:00
commit c142045be2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
dnl See LICENSE for licensing information dnl See LICENSE for licensing information
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([tor],[0.4.3.6-dev]) AC_INIT([tor],[0.4.3.7])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -16,7 +16,7 @@ configure_flags="$*"
# version number changes. Tor uses it to make sure that it # version number changes. Tor uses it to make sure that it
# only shuts down for missing "required protocols" when those protocols # only shuts down for missing "required protocols" when those protocols
# are listed as required by a consensus after this date. # are listed as required by a consensus after this date.
AC_DEFINE(APPROX_RELEASE_DATE, ["2020-07-09"], # for 0.4.3.6-dev AC_DEFINE(APPROX_RELEASE_DATE, ["2020-11-09"], # for 0.4.3.7
[Approximate date when this software was released. (Updated when the version changes.)]) [Approximate date when this software was released. (Updated when the version changes.)])
# "foreign" means we don't follow GNU package layout standards # "foreign" means we don't follow GNU package layout standards

2
contrib/win32build/tor-mingw.nsi.in
View File

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

2
src/win32/orconfig.h
View File

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