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

[tor/master] 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/master] Merge branch 'maint-0.4.5'
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit cfeb063f2462ef374a77d38c39a14b88255dc8a5 Merge: efb174df24 a6533af9e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.4.5' changes/ticket40286_minimal | 7 ++++--- src/feature/dirparse/unparseable.c | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0

[tor/master] Clarify new intended strategy with TROVE-2021-001
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit efca9ce41c96bb0044f504ced36a2734b1689ee2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 08:53:36 2021 -0400 Clarify new intended strategy with TROVE-2021-001 We're going to disable this feature in all versions for now. --- changes/ticket40286_minimal | 7 ++++--- src/feature/dirparse/unparseable.c | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/ticket40286_minimal b/changes/ticket40286_minimal index b8669debaa..6a04ca79eb 100644 --- a/changes/ticket40286_minimal +++ b/changes/ticket40286_minimal @@ -1,5 +1,6 @@ - o Major bugfixes (denial of service): + o Major bugfixes (security, denial of service): - Disable the dump_desc() function that we used to dump unparseable information to disk. It was called incorrectly in several places, - in a way that could lead to excessive CPU usage. - Fixes bug 40286; bugfix on 0.2.2.1-alpha. + in a way that could lead to excessive CPU usage. Fixes bug 40286; + bugfix on 0.2.2.1-alpha. This bug is also tracked as + TROVE-2021-001 and CVE-2021-28089. diff --git a/src/feature/dirparse/unparseable.c b/src/feature/dirparse/unparseable.c index a547335452..1d623fe701 100644 --- a/src/feature/dirparse/unparseable.c +++ b/src/feature/dirparse/unparseable.c @@ -493,8 +493,11 @@ dump_desc,(const char *desc, const char *type)) tor_assert(desc); tor_assert(type); #ifndef TOR_UNIT_TESTS - /* On older versions of Tor we are disabling this function, since it - * can be called with strings that are far too long. */ + /* For now, we are disabling this function, since it can be called with + * strings that are far too long. We can turn it back on if we fix it + * someday, but we'd need to give it a length argument. A likelier + * resolution here is simply to remove this module entirely. See tor#40286 + * for background. */ if (1) return; #endif

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 7c00afe0fbddd552f4e04e1ad37b1bdae6daf330 Merge: 61731e3550 f2cfd1ffad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 09:41:38 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

[tor/master] 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/master] 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/master] Merge branch 'maint-0.4.5'
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit dbf485c1f85cc4eae495ab3758ab474bc9647576 Merge: 444233c15e be17a5a3cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 07:42:03 2021 -0400 Merge branch 'maint-0.4.5'

1 0

[tor/master] 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/master] Merge branch 'maint-0.4.5'
by nickm＠torproject.org 16 Mar '21

16 Mar '21

commit efb174df242adf964e383381d31b891c5f535f1f Merge: 8e4965aa36 7c5a67ccd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 08:52:53 2021 -0400 Merge branch 'maint-0.4.5' changes/ticket40286_minimal | 5 +++++ src/feature/dirparse/unparseable.c | 6 ++++++ 2 files changed, 11 insertions(+)

1 0

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

16 Mar '21

commit 2eb900f7e2ca64e6ce16fc86410cafd935e7cd1e Merge: b9f6539008 efca9ce41c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/ticket40286_minimal | 7 ++++--- src/feature/dirparse/unparseable.c | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0