February 2022 - tor-commits - lists.torproject.org

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit a2be0c590cafbe12578e15ddac6eb4a0625587f6 Merge: 81a4f92b64 92b4e4d041 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 4 12:36:19 2022 -0500 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit ac5533cea7e630eb3de342793a4866ff2bc86f91 Merge: 3d3c4b6dd5 92b4e4d041 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 4 12:36:44 2022 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.6] version: Bump version to 0.4.5.12-dev
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit 92b4e4d04127bfdca4a3c869953e9fdf640729c7 Author: Tor CI Release <no-email(a)torproject.org> Date: Fri Feb 4 16:29:20 2022 +0000 version: Bump version to 0.4.5.12-dev --- 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 b0044a1b15..b0ceb8a1f2 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.12]) +AC_INIT([tor],[0.4.5.12-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, ["2022-02-04"], # for 0.4.5.12 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-02-04"], # for 0.4.5.12-dev [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 a7c7791919..9e5729e4e0 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.12" +!define VERSION "0.4.5.12-dev" !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 431c372152..a244ce4698 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.12" +#define VERSION "0.4.5.12-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] version: Bump version to 0.4.6.10-dev
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit 5afdc851b2096f046503e63d9465d3c2c3ffba9a Author: Tor CI Release <no-email(a)torproject.org> Date: Fri Feb 4 16:29:20 2022 +0000 version: Bump version to 0.4.6.10-dev --- 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 58be6dd0a3..75e76d9075 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.10]) +AC_INIT([tor],[0.4.6.10-dev]) 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-02-04"], # for 0.4.6.10 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-02-04"], # for 0.4.6.10-dev [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 9c375a50e0..31579e7041 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.10" +!define VERSION "0.4.6.10-dev" !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 890b2b7274..6c8997e5fb 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.10" +#define VERSION "0.4.6.10-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.5] version: Bump version to 0.4.5.12-dev
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit 92b4e4d04127bfdca4a3c869953e9fdf640729c7 Author: Tor CI Release <no-email(a)torproject.org> Date: Fri Feb 4 16:29:20 2022 +0000 version: Bump version to 0.4.5.12-dev --- 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 b0044a1b15..b0ceb8a1f2 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.12]) +AC_INIT([tor],[0.4.5.12-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, ["2022-02-04"], # for 0.4.5.12 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-02-04"], # for 0.4.5.12-dev [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 a7c7791919..9e5729e4e0 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.12" +!define VERSION "0.4.5.12-dev" !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 431c372152..a244ce4698 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.12" +#define VERSION "0.4.5.12-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.6] version: Bump version to 0.4.5.12-dev
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit 92b4e4d04127bfdca4a3c869953e9fdf640729c7 Author: Tor CI Release <no-email(a)torproject.org> Date: Fri Feb 4 16:29:20 2022 +0000 version: Bump version to 0.4.5.12-dev --- 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 b0044a1b15..b0ceb8a1f2 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.12]) +AC_INIT([tor],[0.4.5.12-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, ["2022-02-04"], # for 0.4.5.12 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-02-04"], # for 0.4.5.12-dev [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 a7c7791919..9e5729e4e0 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.12" +!define VERSION "0.4.5.12-dev" !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 431c372152..a244ce4698 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.12" +#define VERSION "0.4.5.12-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit 4c58953fc21108fc7cc6ebce1ee4f21d535e95fa Merge: 22fd351cf5 5afdc851b2 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 4 12:36:45 2022 -0500 Merge branch 'maint-0.4.6' into release-0.4.6 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.6] version: Bump version to 0.4.6.10-dev
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit 5afdc851b2096f046503e63d9465d3c2c3ffba9a Author: Tor CI Release <no-email(a)torproject.org> Date: Fri Feb 4 16:29:20 2022 +0000 version: Bump version to 0.4.6.10-dev --- 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 58be6dd0a3..75e76d9075 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.10]) +AC_INIT([tor],[0.4.6.10-dev]) 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-02-04"], # for 0.4.6.10 +AC_DEFINE(APPROX_RELEASE_DATE, ["2022-02-04"], # for 0.4.6.10-dev [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 9c375a50e0..31579e7041 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.10" +!define VERSION "0.4.6.10-dev" !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 890b2b7274..6c8997e5fb 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.10" +#define VERSION "0.4.6.10-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit a2be0c590cafbe12578e15ddac6eb4a0625587f6 Merge: 81a4f92b64 92b4e4d041 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 4 12:36:19 2022 -0500 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 04 Feb '22

04 Feb '22

commit ed5afc081d9c54f4948e50e38d1877c0aa63019c Merge: fd123afa06 774374ebf5 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 4 11:09:24 2022 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0