- tor-commits - lists.torproject.org

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 6f776001cb95c0ad498ebbe8665f74260d135dd9 Merge: 446135aff0 9280f32fc0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:17:52 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/main] Merge branch 'maint-0.4.6'
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit f31e4050db4e322e6bb1357fec794b323705f23b Merge: 172d510794 fadb57e853 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:18:05 2021 -0400 Merge branch 'maint-0.4.6'

1 0

[tor/maint-0.3.5] version: Bump to 0.3.5.17
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 9280f32fc0e4ab61b6cd06a640d285188f845106 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:16:13 2021 -0400 version: Bump to 0.3.5.17 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e698bf8901..855eb6441a 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.3.5.16-dev]) +AC_INIT([tor],[0.3.5.17]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index c8695bc86c..7a6566a2c3 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.3.5.16" +!define VERSION "0.3.5.17" !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 273806fde3..f32c725b07 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.5.16" +#define VERSION "0.3.5.17"

1 0

[tor/maint-0.4.5] version: Bump to 0.3.5.17
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 9280f32fc0e4ab61b6cd06a640d285188f845106 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:16:13 2021 -0400 version: Bump to 0.3.5.17 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e698bf8901..855eb6441a 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.3.5.16-dev]) +AC_INIT([tor],[0.3.5.17]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index c8695bc86c..7a6566a2c3 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.3.5.16" +!define VERSION "0.3.5.17" !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 273806fde3..f32c725b07 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.5.16" +#define VERSION "0.3.5.17"

1 0

[tor/main] version: Bump to 0.4.5.11
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 446135aff0b38df7e21a0484380f45d52436c36e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:16:44 2021 -0400 version: Bump to 0.4.5.11 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0102304fd2..6bc86ddce7 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.5.10-dev]) +AC_INIT([tor],[0.4.5.11]) 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-08-16"], # for 0.4.5.10 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11 [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 fe25571c77..afcea51596 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.5.10" +!define VERSION "0.4.5.11" !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 a2ebca9eb6..5b8c9a635e 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.5.10" +#define VERSION "0.4.5.11" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] version: Bump to 0.4.5.11
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 446135aff0b38df7e21a0484380f45d52436c36e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:16:44 2021 -0400 version: Bump to 0.4.5.11 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0102304fd2..6bc86ddce7 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.5.10-dev]) +AC_INIT([tor],[0.4.5.11]) 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-08-16"], # for 0.4.5.10 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11 [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 fe25571c77..afcea51596 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.5.10" +!define VERSION "0.4.5.11" !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 a2ebca9eb6..5b8c9a635e 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.5.10" +#define VERSION "0.4.5.11" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 6f776001cb95c0ad498ebbe8665f74260d135dd9 Merge: 446135aff0 9280f32fc0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:17:52 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/maint-0.4.5] version: Bump to 0.4.5.11
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 446135aff0b38df7e21a0484380f45d52436c36e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:16:44 2021 -0400 version: Bump to 0.4.5.11 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0102304fd2..6bc86ddce7 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.5.10-dev]) +AC_INIT([tor],[0.4.5.11]) 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-08-16"], # for 0.4.5.10 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11 [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 fe25571c77..afcea51596 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.5.10" +!define VERSION "0.4.5.11" !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 a2ebca9eb6..5b8c9a635e 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.5.10" +#define VERSION "0.4.5.11" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] version: Bump to 0.4.6.8
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit a647c26a6bfa27a68f228deac022247655364f1e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:17:01 2021 -0400 version: Bump to 0.4.6.8 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1a5a7a7003..43f9f475db 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.6.7-dev]) +AC_INIT([tor],[0.4.6.8]) 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, ["2021-08-16"], # for 0.4.6.7 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8 [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 3dd470100f..c59769cdb8 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.6.7" +!define VERSION "0.4.6.8" !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 cc70a3ab19..ac4a8e31b2 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.6.7" +#define VERSION "0.4.6.8" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] version: Bump to 0.3.5.17
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 9280f32fc0e4ab61b6cd06a640d285188f845106 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 09:16:13 2021 -0400 version: Bump to 0.3.5.17 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e698bf8901..855eb6441a 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.3.5.16-dev]) +AC_INIT([tor],[0.3.5.17]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index c8695bc86c..7a6566a2c3 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.3.5.16" +!define VERSION "0.3.5.17" !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 273806fde3..f32c725b07 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.5.16" +#define VERSION "0.3.5.17"

1 0