Merge branch 'maint-0.4.4' into maint-0.4.5

This commit is contained in:
Alexander Færøy 2021-02-05 17:17:05 +00:00
commit 3496804827
2 changed files with 3 additions and 2 deletions

View File

@ -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 function-size /src/core/or/command.c:command_process_relay_cell() 132
problem dependency-violation /src/core/or/command.c 9 problem dependency-violation /src/core/or/command.c 9
problem file-size /src/core/or/connection_edge.c 4655 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 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_expire_beginning() 117
problem function-size /src/core/or/connection_edge.c:connection_ap_handshake_rewrite() 193 problem function-size /src/core/or/connection_edge.c:connection_ap_handshake_rewrite() 193

View File

@ -31,6 +31,8 @@ static const struct {
{ NULL, 0 } { NULL, 0 }
}; };
#if !defined(_WIN32)
/* Returns the first port that we think we can bind to without special /* Returns the first port that we think we can bind to without special
* permissions. Usually this function returns 1024. */ * permissions. Usually this function returns 1024. */
static uint16_t static uint16_t
@ -67,8 +69,6 @@ unprivileged_port_range_start(void)
return result; return result;
} }
#if !defined(_WIN32)
#define PORT_TEST_RANGE_START 600 #define PORT_TEST_RANGE_START 600
#define PORT_TEST_RANGE_END 1024 #define PORT_TEST_RANGE_END 1024