tor-commits March 2020

tor-commits@lists.torproject.org

21 participants
1780 discussions

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 36ae644fcd8009b7b719e3d389ac84201129a678 Merge: 8fef85306 d17108a18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:57:42 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] Bump to 0.3.5.10
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit d17108a187e32a4d5464d2428b8943702c6d5cde Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:56:31 2020 -0400 Bump to 0.3.5.10 --- 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 834fea073..da158eb23 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.9-dev]) +AC_INIT([tor],[0.3.5.10]) 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 9eeb32822..8f5f38963 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.9-dev" +!define VERSION "0.3.5.10" !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 baad733d0..42e3e1a4c 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.9-dev" +#define VERSION "0.3.5.10"

1 0

[tor/release-0.4.1] Bump to 0.4.1.9
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 7f0ad3343e2139f368f896ca44f8a9d9d84e6346 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:56:22 2020 -0400 Bump to 0.4.1.9 --- 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 48f3dfc00..1d6b8ee15 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.1.8-dev]) +AC_INIT([tor],[0.4.1.9]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # 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, ["2020-01-30"], # for 0.4.1.8-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9 [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 40783299c..01f5a5740 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.1.8-dev" +!define VERSION "0.4.1.9" !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 c23dfe7bb..9e5d1d47c 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.4.1.8-dev" +#define VERSION "0.4.1.9"

1 0

[tor/release-0.4.1] Bump to 0.3.5.10
by nickm＠torproject.org 13 Mar '20

13 Mar '20

1 0

[tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 7a9e2a261b44b93e244c04593dee8f7757ba32bc Merge: 7f0ad3343 d17108a18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:56:44 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 "ours" to avoid version bump.

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit b9d71f3848a2858dc0a3c5232c85d97525aacd25 Merge: add387c50 1f163fcbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:09 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit b2e543bfe74bb5855a86429c61c0efc91d660719 Merge: c96cf1494 b9d71f384 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 6ed2c9e5fa8c4699cd55bae51248ae24c4d43d3f Merge: b50494233 b2e543bfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
by nickm＠torproject.org 13 Mar '20

13 Mar '20

1 0

[tor/maint-0.4.2] Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE()
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 1f163fcbde4591bcb5764d6bbe0fea8aa559fc33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 08:31:22 2020 -0500 Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE() We introduced these BUG() checks in b0ddaac07428a06 to prevent a recurrence of bug 23690. But there's a report of the BUG() message getting triggered and filling up the disk. Let's change it to IF_BUG_ONCE(). Fixes bug 33093; bugfix on 0.3.2.2-alpha. --- changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug33093_logging b/changes/bug33093_logging new file mode 100644 index 000000000..e26e4a64a --- /dev/null +++ b/changes/bug33093_logging @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - If we encounter a bug when flushing a buffer to a TLS connection, + only log the bug once per invocation of the Tor process. Previously we + would log with every occurrence, which could cause us to run out of + disk space. Fixes bug 33093; bugfix on 0.3.2.2-alpha. diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index e92cb9163..b570216df 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -146,10 +146,10 @@ buf_flush_to_tls(buf_t *buf, tor_tls_t *tls, size_t flushlen, size_t flushed = 0; ssize_t sz; tor_assert(buf_flushlen); - if (BUG(*buf_flushlen > buf->datalen)) { + IF_BUG_ONCE(*buf_flushlen > buf->datalen) { *buf_flushlen = buf->datalen; } - if (BUG(flushlen > *buf_flushlen)) { + IF_BUG_ONCE(flushlen > *buf_flushlen) { flushlen = *buf_flushlen; } sz = (ssize_t) flushlen;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2020