tor

commit 34968048273faf0cde4d0c69d466b4d8d7275ab7
parent 0a40892e8c376a3106cec1a4e9ba74f4dd146e68
Author: Alexander Færøy <ahf@torproject.org>
Date:   Fri,  5 Feb 2021 17:17:05 +0000

Merge branch 'maint-0.4.4' into maint-0.4.5

Diffstat:
M
scripts/maint/practracker/exceptions.txt
 | 
1
+
M
src/test/test_switch_id.c
 | 
4
++--

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt
@@ -130,6 +130,7 @@ problem function-size /src/core/or/command.c:command_process_create_cell() 156
 problem function-size /src/core/or/command.c:command_process_relay_cell() 132
 problem dependency-violation /src/core/or/command.c 9
 problem file-size /src/core/or/connection_edge.c 4655
+problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 130
 problem include-count /src/core/or/connection_edge.c 65
 problem function-size /src/core/or/connection_edge.c:connection_ap_expire_beginning() 117
 problem function-size /src/core/or/connection_edge.c:connection_ap_handshake_rewrite() 193
diff --git 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