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

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 1a9555e28352c0807527126a2e5b3fd6b95fe8a0 Merge: 6205810f8 08ddf1f62 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 13:53:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5 changes/bug28525 | 8 ++++++++ src/lib/net/address.c | 19 +++++++++++++++---- src/test/test_addr.c | 18 ++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 654769bcec3e98bea5e3ac48b2aabffcbe55375e Merge: 1ba2bd359 c8c2e2b8f Author: teor <teor(a)torproject.org> Date: Fri Aug 9 14:05:26 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5 changes/bug30781 | 4 ++++ src/feature/dirparse/routerparse.c | 3 +++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 8a4635a5fe951dd9fa917eb670c8d3138b3d0b90 Merge: 7502881de fb3f46140 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 14:05:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0 changes/bug30781 | 4 ++++ src/feature/dirparse/routerparse.c | 3 +++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.4.0] Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 37bd7fa50d0901a87084b71299cc8c8786cd1cd8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 9 13:14:28 2019 -0400 Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9 --- src/or/buffers.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 394ba0ccb..b36e4ab50 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -394,10 +394,6 @@ buf_free(buf_t *buf) { if (!buf) return; - if (BUG(buf_out->datalen >= INT_MAX || buf_in->datalen >= INT_MAX)) - return; - if (BUG(buf_out->datalen >= INT_MAX - buf_in->datalen)) - return; buf_clear(buf); buf->magic = 0xdeadbeef; @@ -2067,4 +2063,3 @@ assert_buf_ok(buf_t *buf) tor_assert(buf->datalen == total); } } -

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 254c1bac453fdb7d3e29a5cde9757542990a6989 Merge: e07d08a16 ba83c1e5c Author: teor <teor(a)torproject.org> Date: Sat Aug 10 07:21:56 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9 changes/bug30781 | 4 ++++ src/or/routerparse.c | 3 +++ 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.4.0] Fix #28525 changes file that is breaking CI.
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit c35aded00a19f26f3124584e7d0f561cf579efec Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Mar 12 20:11:51 2019 +0200 Fix #28525 changes file that is breaking CI. --- changes/bug28525 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/changes/bug28525 b/changes/bug28525 index 392a9265e..988ffb219 100644 --- a/changes/bug28525 +++ b/changes/bug28525 @@ -1,8 +1,7 @@ - o Minor bugfixes (address selection): + o Minor features (address selection): - Make Tor aware of the RFC 6598 (Carrier Grade NAT) IP range, which is the subnet 100.64.0.0/10. This is deployed by many ISPs as an alternative to RFC 1918 that does not break existing internal networks. This patch fixes security issues caused by RFC 6518 by blocking control ports on these addresses and warns users if client ports or ExtORPorts are listening on - a RFC 6598 address. Fixes bug 28525; bugfix on 0.4.1.1-alpha. Patch by - Neel Chauhan. + a RFC 6598 address. Closes ticket 28525. Patch by Neel Chauhan.

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit e0f9a8222b53772a6879ecddb41738a223e3b888 Merge: c35aded00 37bd7fa50 Author: teor <teor(a)torproject.org> Date: Sat Aug 10 07:21:31 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9 changes/bug30041 | 5 +++++ src/or/buffers.c | 4 +++- src/or/connection.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit e07d08a169c3dd43f4cd134c8f993c3f199c2bcc Merge: e0f9a8222 0e0cf4abd Author: teor <teor(a)torproject.org> Date: Sat Aug 10 07:21:43 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9 changes/bug30561 | 6 ++++++ src/common/compat.c | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit bad00108087c4c34e34966fdeb01ae1e8bb14666 Merge: 8a4635a5f 5df0b3662 Author: teor <teor(a)torproject.org> Date: Sat Aug 10 07:26:21 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug30561 | 6 ++++++ src/lib/string/printf.c | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'bug30781_035' into bug30781_040
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit fb3f461406d9d22da3ce0b602409c6610b8bb4f7 Merge: 6a6f7eb67 c8c2e2b8f Author: teor <teor(a)torproject.org> Date: Thu Jun 6 09:56:50 2019 +1000 Merge branch 'bug30781_035' into bug30781_040 changes/bug30781 | 4 ++++ src/feature/dirparse/routerparse.c | 3 +++ 2 files changed, 7 insertions(+)

1 0