October 2021 - tor-commits - lists.torproject.org

[tor/main] Use TOR_PRIuSZ instead of %ld for CC logging.
by ahf＠torproject.org 29 Oct '21

29 Oct '21

commit ee38ec02f36906f344e4408c6b7a44ef435e1625 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Oct 29 19:08:20 2021 +0000 Use TOR_PRIuSZ instead of %ld for CC logging. This patch fixes the current build of main on Windows. --- src/core/or/congestion_control_flow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/or/congestion_control_flow.c b/src/core/or/congestion_control_flow.c index 9e0cd670c7..805654664c 100644 --- a/src/core/or/congestion_control_flow.c +++ b/src/core/or/congestion_control_flow.c @@ -447,7 +447,7 @@ flow_control_decide_xoff(edge_connection_t *stream) if (total_buffered > buffer_limit_xoff) { if (!stream->xoff_sent) { - log_info(LD_EDGE, "Sending XOFF: %ld %d", + log_info(LD_EDGE, "Sending XOFF: %"TOR_PRIuSZ" %d", total_buffered, buffer_limit_xoff); tor_trace(TR_SUBSYS(cc), TR_EV(flow_decide_xoff_sending), stream); @@ -544,7 +544,7 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) /* If we have no drain start timestamp, and we still have * remaining buffer, start the buffering counter */ if (!stream->drain_start_usec && total_buffered > 0) { - log_debug(LD_EDGE, "Began edge buffering: %d %d %ld", + log_debug(LD_EDGE, "Began edge buffering: %d %d %"TOR_PRIuSZ, stream->ewma_rate_last_sent, stream->ewma_drain_rate, total_buffered); @@ -580,7 +580,7 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) (uint32_t)n_count_ewma(drain_rate, stream->ewma_drain_rate, xon_ewma_cnt); - log_debug(LD_EDGE, "Updating drain rate: %d %d %ld", + log_debug(LD_EDGE, "Updating drain rate: %d %d %"TOR_PRIuSZ, drain_rate, stream->ewma_drain_rate, total_buffered); @@ -600,7 +600,7 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) if (stream_drain_rate_changed(stream)) { /* If we are still buffering and the rate changed, update * advisory XON */ - log_info(LD_EDGE, "Sending rate-change XON: %d %d %ld", + log_info(LD_EDGE, "Sending rate-change XON: %d %d %"TOR_PRIuSZ, stream->ewma_rate_last_sent, stream->ewma_drain_rate, total_buffered); @@ -608,7 +608,7 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) circuit_send_stream_xon(stream); } } else if (total_buffered == 0) { - log_info(LD_EDGE, "Sending XON: %d %d %ld", + log_info(LD_EDGE, "Sending XON: %d %d %"TOR_PRIuSZ, stream->ewma_rate_last_sent, stream->ewma_drain_rate, total_buffered);

1 0

[tor-browser-build/master] Bug 40366: Use bullseye to build https-everywhere
by boklm＠torproject.org 29 Oct '21

29 Oct '21

commit ad7289e3af09b1883e13305fe49ef24cb218c3b3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 24 15:56:36 2021 +0200 Bug 40366: Use bullseye to build https-everywhere --- projects/https-everywhere/config | 6 +++--- rbm.conf | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index f51b13c..13fd3bd 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -10,14 +10,14 @@ var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid # building the same thing 4 times, using 4 different container images # (each one with a different suite or architecture), we set the container - # to buster/amd64 for all platforms. This allows us to create only one + # to bullseye/amd64 for all platforms. This allows us to create only one # container image, and also build the extension only one time as the # filename does not contain the platform, and var/build_id should be # the same since there is now nothing platform specific in the build # inputs. This allows us to save a little time and disk space. container: use_container: 1 - suite: buster + suite: bullseye arch: amd64 deps: - git @@ -34,4 +34,4 @@ input_files: - project: python name: python target_prepend: - - common-buster + - common-bullseye diff --git a/rbm.conf b/rbm.conf index dc7072b..b5c0566 100644 --- a/rbm.conf +++ b/rbm.conf @@ -247,13 +247,13 @@ targets: # Don't create mar files to save time build_mar: 0 - # The common-buster target is used to build components that are common to all - # platforms, using Debian Buster. - common-buster: + # The common-bullseye target is used to build components that are common to all + # platforms, using Debian Bullseye. + common-bullseye: var: common: 1 container: - suite: buster + suite: bullseye arch: amd64 pre_pkginst: '' deps:

1 0

[tor-browser-build/master] Bug 40368: Use system's python3 for https-everywhere
by boklm＠torproject.org 29 Oct '21

29 Oct '21

commit ce2c78e4ccc24a4b46ff9336f54b1ec8129e430c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 30 14:40:45 2021 +0200 Bug 40368: Use system's python3 for https-everywhere --- projects/https-everywhere/build | 1 - projects/https-everywhere/config | 6 ++---- rbm.conf | 17 ----------------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build index 88431e0..10dd4bf 100644 --- a/projects/https-everywhere/build +++ b/projects/https-everywhere/build @@ -1,6 +1,5 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] ./make.sh diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 13fd3bd..9af5ff6 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -27,11 +27,9 @@ var: - rsync - zip - unzip + - python3 + - python3-distutils pre_pkginst: '' input_files: - project: container-image - - project: python - name: python - target_prepend: - - common-bullseye diff --git a/rbm.conf b/rbm.conf index b5c0566..7295953 100644 --- a/rbm.conf +++ b/rbm.conf @@ -247,23 +247,6 @@ targets: # Don't create mar files to save time build_mar: 0 - # The common-bullseye target is used to build components that are common to all - # platforms, using Debian Bullseye. - common-bullseye: - var: - common: 1 - container: - suite: bullseye - arch: amd64 - pre_pkginst: '' - deps: - - build-essential - - python - - automake - - libtool - - zip - - unzip - torbrowser-android-armv7: - android-armv7 - android

1 0

[tor/main] Merge branch 'maint-0.4.6' into main
by ahf＠torproject.org 29 Oct '21

29 Oct '21

commit 558037f6ed8344980835eafa6d13c26ee17555ce Merge: 294e8a8879 57f296b396 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Oct 29 16:56:33 2021 +0000 Merge branch 'maint-0.4.6' into main

1 0

[tor/main] Fix Windows build.
by ahf＠torproject.org 29 Oct '21

29 Oct '21

commit 5c8deef9b67f7bf983dd96164c118317422c236b Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 5 17:12:52 2021 +0000 Fix Windows build. While trying to resolve our CI issues, the Windows build broke with an unused function error: src/test/test_switch_id.c:37:1: error: ‘unprivileged_port_range_start’ defined but not used [-Werror=unused-function] We solve this by moving the `#if !defined(_WIN32)` test above the `unprivileged_port_range_start()` function defintion such that it is included in its body. This is an unreviewed commit. See: tor#40275 --- src/test/test_switch_id.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index 91277e374f..1c13ad3f24 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -31,6 +31,8 @@ static const struct { { NULL, 0 } }; +#if !defined(_WIN32) + /* Returns the first port that we think we can bind to without special * permissions. Usually this function returns 1024. */ static uint16_t @@ -67,8 +69,6 @@ unprivileged_port_range_start(void) return result; } -#if !defined(_WIN32) - #define PORT_TEST_RANGE_START 600 #define PORT_TEST_RANGE_END 1024

1 0

[tor/maint-0.3.5] Fix Windows build.
by ahf＠torproject.org 29 Oct '21

29 Oct '21

commit 5c8deef9b67f7bf983dd96164c118317422c236b Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 5 17:12:52 2021 +0000 Fix Windows build. While trying to resolve our CI issues, the Windows build broke with an unused function error: src/test/test_switch_id.c:37:1: error: ‘unprivileged_port_range_start’ defined but not used [-Werror=unused-function] We solve this by moving the `#if !defined(_WIN32)` test above the `unprivileged_port_range_start()` function defintion such that it is included in its body. This is an unreviewed commit. See: tor#40275 --- src/test/test_switch_id.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index 91277e374f..1c13ad3f24 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -31,6 +31,8 @@ static const struct { { NULL, 0 } }; +#if !defined(_WIN32) + /* Returns the first port that we think we can bind to without special * permissions. Usually this function returns 1024. */ static uint16_t @@ -67,8 +69,6 @@ unprivileged_port_range_start(void) return result; } -#if !defined(_WIN32) - #define PORT_TEST_RANGE_START 600 #define PORT_TEST_RANGE_END 1024

1 0

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 29 Oct '21

29 Oct '21

commit 57f296b396fef3fd5101cb790430514041c2ce36 Merge: 77c47417f2 77f5bfa60e Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Oct 29 16:56:33 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5
by ahf＠torproject.org 29 Oct '21

29 Oct '21

commit 77f5bfa60e0030d6c26eb01ea5fb1a04e0b2d6bb Merge: 3ebf217009 5c8deef9b6 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Oct 29 16:56:33 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by ahf＠torproject.org 29 Oct '21

29 Oct '21

commit 77f5bfa60e0030d6c26eb01ea5fb1a04e0b2d6bb Merge: 3ebf217009 5c8deef9b6 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Oct 29 16:56:33 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by ahf＠torproject.org 29 Oct '21

29 Oct '21

commit 77f5bfa60e0030d6c26eb01ea5fb1a04e0b2d6bb Merge: 3ebf217009 5c8deef9b6 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Oct 29 16:56:33 2021 +0000 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0