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

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 +++++ src/core/or/connection_edge.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:17:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5 changes/bug31408 | 5 ++++ src/lib/fs/conffile.c | 10 +++++--- src/test/test_config.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 6bfdd096792194d1077a101a34859bff996c940e Merge: 15d67842f bf4a27c0e Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:16:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5 changes/ticket31466 | 5 +++++ src/core/or/connection_edge.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 4f9a0033920b21882c4b6eead3c55551826ee8e9 Merge: 63aff4a43 9b73088c1 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:19:13 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1 changes/bug31897 | 3 +++ src/test/test_util.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.1] changes: use correct bugfix release, and reword changes file for 31408
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 0614f839054a52e6e1a79a366fcc70da0691df66 Author: teor <teor(a)torproject.org> Date: Mon Sep 23 11:11:50 2019 +1000 changes: use correct bugfix release, and reword changes file for 31408 --- changes/bug31408 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug31408 b/changes/bug31408 index 7a6744cee..3e4ffa927 100644 --- a/changes/bug31408 +++ b/changes/bug31408 @@ -1,4 +1,5 @@ o Major bugfixes (torrc): - - Fix configuration files in a %included folder containing a - configuration file with only comments or whitespace being - ignored. Fixes bug 31408; bugfix on 0.4.0.5. + - Stop ignoring torrc options after an %include directive, when the + included directory ends with a file that does not contain any config + options. (But does contain comments or whitespace.) + Fixes bug 31408; bugfix on 0.3.1.1-alpha.

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit fd31468ea14c6c8f659833ae0398e931f95fb1b3 Merge: 13155e241 de6ceb0be Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:19:50 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31408 | 5 ++++ changes/bug31837 | 5 ++++ changes/bug31897 | 3 +++ src/lib/fs/conffile.c | 10 +++++--- src/test/test_config.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ src/test/test_rebind.py | 16 +++++++----- src/test/test_util.c | 5 ++-- 7 files changed, 99 insertions(+), 13 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit e241523195d2bc3ac03383aab9c88e612633d461 Merge: ff601da0d 03e77ef03 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:19:42 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug30916 | 4 +++ changes/bug31107 | 4 +++ changes/bug31408 | 5 ++++ changes/bug31837 | 5 ++++ changes/ticket31466 | 5 ++++ src/core/or/channeltls.c | 10 ++++++- src/core/or/connection_edge.c | 6 ++-- src/feature/relay/router.c | 18 +++++------- src/lib/fs/conffile.c | 10 ++++--- src/test/test_config.c | 68 +++++++++++++++++++++++++++++++++++++++++++ src/test/test_rebind.py | 16 +++++----- 11 files changed, 127 insertions(+), 24 deletions(-)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit c06d540ff9b507e0fa9749948fe406fb17dbee73 Merge: 752c35ca9 3c97ab3c2 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:14:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9 changes/bug31107 | 4 ++++ src/or/channeltls.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.2] util/map_anon_nofork: Add a cast to avoid passing -48 to memset
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 9b73088c14fe24a1554950363fb80468c695937f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 3 07:21:25 2019 -0400 util/map_anon_nofork: Add a cast to avoid passing -48 to memset This fixes coverity CID 1454593, and bug 31948. Bug not in any released version of Tor. --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6ecff6f1c..b4d8a4d76 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6190,7 +6190,7 @@ test_util_map_anon_nofork(void *arg) tor_munmap_anonymous(ptr, sz); ptr = tor_mmap_anonymous(sz, ANONMAP_NOINHERIT, &inherit); tt_ptr_op(ptr, OP_NE, 0); - memset(ptr, TEST_VALUE, sz); + memset(ptr, (uint8_t)TEST_VALUE, sz); tt_int_op(0, OP_EQ, pipe(pipefd)); pid_t child = fork();

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 4abfcb7997e4a753643fd969317c502efc6be06e Merge: 0e2834a37 cf2b00d3f Author: teor <teor(a)torproject.org> Date: Wed Nov 6 11:18:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5 changes/bug31837 | 5 +++++ src/test/test_rebind.py | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0