Commit f43a7497 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'maint-0.4.7' into release-0.4.7

parents ca1e0888 56ac77ba

configure.ac

+2 −2
Original line number Diff line number Diff line
@@ -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.7.11-dev])

AC_INIT([tor],[0.4.7.12])

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, ["2022-11-10"], # for 0.4.7.11-dev

AC_DEFINE(APPROX_RELEASE_DATE, ["2022-12-06"], # for 0.4.7.12

          [Approximate date when this software was released. (Updated when the version changes.)])



# "foreign" means we don't follow GNU package layout standards

contrib/win32build/tor-mingw.nsi.in

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
!include "LogicLib.nsh"

!include "FileFunc.nsh"

!insertmacro GetParameters

!define VERSION "0.4.7.11-dev"

!define VERSION "0.4.7.12"

!define INSTALLER "tor-${VERSION}-win32.exe"

!define WEBSITE "https://www.torproject.org/"

!define LICENSE "LICENSE"

src/win32/orconfig.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
#define USING_TWOS_COMPLEMENT



/* Version number of package */

#define VERSION "0.4.7.11-dev"

#define VERSION "0.4.7.12"



#define HAVE_STRUCT_SOCKADDR_IN6

#define HAVE_STRUCT_IN6_ADDR