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

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

09 Aug '19

commit 65343a966e48e6eb49873f3cdb9a9f68bf72c70c Merge: 4665ac9ec b560d94ac Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:49:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035 changes/ticket31374 | 4 ++++ src/lib/time/compat_time.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

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

09 Aug '19

commit 2bc8989d833c3b583395380031e9b730d1c3fb37 Merge: 7667c1cba 3a280b35e Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:48:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029 changes/ticket31374 | 4 ++++ src/common/compat_time.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/release-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 … [View More]

1 0

[tor/release-0.4.0] Merge branch 'bug31343_31374_029' into bug31343_31374_035
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit d4184fca30eedc8fdd82f87f34151a9e6558e176 Merge: 65343a966 2bc8989d8 Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:51:35 2019 +1000 Merge branch 'bug31343_31374_029' into bug31343_31374_035

1 0

[tor/release-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-… [View More]

1 0

[tor/release-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/release-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 5df0b36623005526588c35cb63b47dd256dcc5b7 Merge: 654769bce 254c1bac4 Author: teor <teor(a)torproject.org> Date: Sat Aug 10 07:25:57 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Delete src/or/buffers.c which was fixup'ed in 0.2.9 but moved in 0.3.5. The 0.2.9 fix is not required for the 0.3.5 patch. Resolves merge conflict caused by 30041.

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit 4665ac9ec70105f490ebd810e58281e0c8f03926 Merge: e83eabc9b a4400a77a Author: teor <teor(a)torproject.org> Date: Fri Aug 9 09:49:27 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035 changes/bug31343 | 9 +++++++++ src/core/or/channeltls.c | 24 ++++++++++++++++++++---- src/feature/nodelist/routerlist.c | 6 ++++-- 3 files changed, 33 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'bug30184_029' into bug30184_034
by teor＠torproject.org 09 Aug '19

09 Aug '19

commit dfdd877647ef496b2b4a82e8c1e6040692ecebb5 Merge: 48e990359 031ed59db Author: teor <teor(a)torproject.org> Date: Wed Apr 17 11:51:32 2019 +1000 Merge branch 'bug30184_029' into bug30184_034 "ours" merge, because 0.3.4 has a different set of changes, which already compile.

1 0

[tor/release-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