March 2021 - tor-commits - lists.torproject.org

[tor/maint-0.4.5] Bump to 0.3.5.14
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit 1a0b5fd569684fc2d75436f7b3befcc5652c87e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 07:39:45 2021 -0400 Bump to 0.3.5.14 --- 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 44f96b6616..af3762d460 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.13-dev]) +AC_INIT([tor],[0.3.5.14]) 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 a4ddf8b46c..1f3f728aa0 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.13-dev" +!define VERSION "0.3.5.14" !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 991369b9f9..9cab6cf3e3 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.13-dev" +#define VERSION "0.3.5.14"

1 0

[tor/maint-0.4.4] Remove check-best-practices from check-local in 0.4.4
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit f2cfd1ffad439350e907483255c150360ea37108 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 09:41:19 2021 -0400 Remove check-best-practices from check-local in 0.4.4 --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a723c167ef..a212ae19c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -275,7 +275,6 @@ check-local: \ check-spaces \ check-changes \ check-includes \ - check-best-practices \ shellcheck # test-network requires a copy of Chutney in $CHUTNEY_PATH.

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit 8ada4263a95b2a5bc6ef6022664aadca14039d97 Merge: 9f59b6f458 1a0b5fd569 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 07:40:06 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 "ours" to avoid version bump.

1 0

[tor/maint-0.4.5] Bump to 0.4.4.8
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit fb2c889a388e85ca808e30106fd8a8194ed72f07 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 07:40:48 2021 -0400 Bump to 0.4.4.8 --- 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 db5bfee202..731fb29f28 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.4.7-dev]) +AC_INIT([tor],[0.4.4.8]) 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-02-03"], # for 0.4.4.7-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-03-15"], # for 0.4.4.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 39b7999fd1..06a204fe5b 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.4.7-dev" +!define VERSION "0.4.4.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 d1d60bffa2..b7e1cdff48 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.4.7-dev" +#define VERSION "0.4.4.8" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.5] Merge branch 'bug40286_disable_min_035' into maint-0.3.5
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit f46f4562cf6f47fe6c00752f61b04dc18a454253 Merge: 1a0b5fd569 ede88c374c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 08:41:03 2021 -0400 Merge branch 'bug40286_disable_min_035' into maint-0.3.5 changes/ticket40286_minimal | 5 +++++ src/feature/dirparse/unparseable.c | 6 ++++++ 2 files changed, 11 insertions(+)

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit b9f65390089817a74bf20d93e93a15b41a970f79 Merge: fb2c889a38 f46f4562cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 08:52:28 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/ticket40286_minimal | 5 +++++ src/feature/dirparse/unparseable.c | 6 ++++++ 2 files changed, 11 insertions(+)

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit 5e771327afb49a202044a33741f54abf897fe402 Merge: 433f526af6 fb2c889a38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 07:40:56 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump.

1 0

[tor/maint-0.4.5] Bump to 0.4.5.7
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit be17a5a3cffa72ee51bfd854d4e82a90c64c51d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 07:41:54 2021 -0400 Bump to 0.4.5.7 --- 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 4d91b11cea..0f2d6567e1 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.6-dev]) +AC_INIT([tor],[0.4.5.7]) 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-02-15"], # for 0.4.5.6-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-03-15"], # for 0.4.5.7 [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 2eda8d1697..e599a0857a 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.6-dev" +!define VERSION "0.4.5.7" !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 ffa9e3f2fb..9a138c0928 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.6-dev" +#define VERSION "0.4.5.7" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit 5ec579610ace4d3e4f0a6432b26e1e968beccf36 Merge: 2eb900f7e2 f078aab71e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 09:01:59 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40316 | 5 +++++ src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.5] Remove check-best-practices from check-local in 0.4.4
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit f2cfd1ffad439350e907483255c150360ea37108 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 09:41:19 2021 -0400 Remove check-best-practices from check-local in 0.4.4 --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a723c167ef..a212ae19c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -275,7 +275,6 @@ check-local: \ check-spaces \ check-changes \ check-includes \ - check-best-practices \ shellcheck # test-network requires a copy of Chutney in $CHUTNEY_PATH.

1 0