- tor-commits - lists.torproject.org

[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

[tor/maint-0.4.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/maint-0.4.6] 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.4.6] 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