November 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit a58b19465d9ffada3df87ea9be769d1f27c414cc Merge: eba989bf0 16ca6fdfd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:56:48 2018 -0500 Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5 changes/bug28441 | 4 ++++ src/feature/nodelist/nodelist.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] log: stop talking about the Named flag in log messages
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 16ca6fdfdb238046665e749c386c9c28a8245712 Author: teor <teor(a)torproject.org> Date: Wed Nov 7 18:48:21 2018 +1000 log: stop talking about the Named flag in log messages Clients have ignored the Named flag since 0.3.2. Fixes bug 28441; bugfix on 0.3.2.1-alpha. --- changes/bug28441 | 4 ++++ src/feature/nodelist/nodelist.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug28441 b/changes/bug28441 new file mode 100644 index 000000000..d259b9f74 --- /dev/null +++ b/changes/bug28441 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Stop talking about the Named flag in log messages. Clients have + ignored the Named flag since 0.3.2. Fixes bug 28441; + bugfix on 0.3.2.1-alpha. diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index a98a5c865..89c673867 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1019,8 +1019,7 @@ node_get_by_nickname,(const char *nickname, unsigned flags)) } SMARTLIST_FOREACH_END(node); if (any_unwarned) { - log_warn(LD_CONFIG, "There are multiple matches for the name %s, " - "but none is listed as Named in the directory consensus. " + log_warn(LD_CONFIG, "There are multiple matches for the name %s. " "Choosing one arbitrarily.", nickname); } } else if (smartlist_len(matches)==1 && warn_if_unnamed) {

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit a58b19465d9ffada3df87ea9be769d1f27c414cc Merge: eba989bf0 16ca6fdfd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:56:48 2018 -0500 Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5 changes/bug28441 | 4 ++++ src/feature/nodelist/nodelist.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit d098dda776e165647a39ebd7d8dc9982086d8059 Merge: 900d9a860 a58b19465 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:56:52 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28441 | 4 ++++ src/feature/nodelist/nodelist.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] libtorrunner: fix memory leak in child() error path
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 7ba1f3911691d211a0297a4ec486d40c3d70bd8c Author: Martin Kepplinger <martink(a)posteo.de> Date: Tue Nov 13 10:09:29 2018 +0100 libtorrunner: fix memory leak in child() error path This avoids leaking memory in case libtorrunner's child() function fails. --- src/tools/tor_runner.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c index 9ed2ee577..7c43b0d24 100644 --- a/src/tools/tor_runner.c +++ b/src/tools/tor_runner.c @@ -93,6 +93,7 @@ child(const tor_main_configuration_t *cfg) int rv = execv(BINDIR "/tor", args); if (rv < 0) { + free(args); exit(254); } else { abort(); /* Unreachable */

1 0

[tor/master] Work around check-spaces.
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit db3acb3aa398bda46435d94427967410da173222 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:54:57 2018 -0500 Work around check-spaces. --- src/tools/tor_runner.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c index 7c43b0d24..cad57a766 100644 --- a/src/tools/tor_runner.c +++ b/src/tools/tor_runner.c @@ -80,6 +80,7 @@ tor_run_main(const tor_main_configuration_t *cfg) /* circumlocution to avoid getting warned about calling calloc instead of * tor_calloc. */ #define real_calloc calloc +#define real_free free static void child(const tor_main_configuration_t *cfg) @@ -93,10 +94,9 @@ child(const tor_main_configuration_t *cfg) int rv = execv(BINDIR "/tor", args); if (rv < 0) { - free(args); + real_free(args); exit(254); } else { abort(); /* Unreachable */ } } -

1 0

[tor/master] Changes file for bug 28419
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 26fd7c1d9cdb7a3a4c379be7d309bd1b4c6bbaa4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:51:36 2018 -0500 Changes file for bug 28419 --- changes/bug28419 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug28419 b/changes/bug28419 new file mode 100644 index 000000000..52ceb0a2a --- /dev/null +++ b/changes/bug28419 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a harmless memory leak in libtorrunner.a. Fixes bug 28419; + bugfix on 0.3.3.1-alpha. Patch from Martin Kepplinger. \ No newline at end of file

1 0

[tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit eba989bf0e7761713079e4f2af91c9ab9374a300 Merge: 763ccd092 1043532a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:55:07 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug28419 | 3 +++ src/tools/tor_runner.c | 2 ++ 2 files changed, 5 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 1043532a5155cdd2667808e8db2e5de5c486ed8b Merge: 42be1c668 db3acb3aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:55:07 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug28419 | 3 +++ src/tools/tor_runner.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Changes file for bug 28419
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 26fd7c1d9cdb7a3a4c379be7d309bd1b4c6bbaa4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:51:36 2018 -0500 Changes file for bug 28419 --- changes/bug28419 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug28419 b/changes/bug28419 new file mode 100644 index 000000000..52ceb0a2a --- /dev/null +++ b/changes/bug28419 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory leaks): + - Fix a harmless memory leak in libtorrunner.a. Fixes bug 28419; + bugfix on 0.3.3.1-alpha. Patch from Martin Kepplinger. \ No newline at end of file

1 0