torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-gitlab/mr/184' into master

Browse Source
This commit is contained in:
Nick Mathewson
2020-11-17 08:22:44 -05:00
parent 1b21d716ec 09b3af578d
commit 6c61011781
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mainloop/connection.c
-7
View File
@@ -1718,13 +1718,6 @@ connection_listener_new(const struct sockaddr *listensockaddr,
}
}
/* Force IPv4 and IPv6 traffic on for non-SOCKSPorts.
* Forcing options on isn't a good idea, see #32994 and #33607. */
if (type != CONN_TYPE_AP_LISTENER) {
lis_conn->entry_cfg.ipv4_traffic = 1;
lis_conn->entry_cfg.ipv6_traffic = 1;
}
if (connection_add(conn) < 0) { /* no space, forget it */
log_warn(LD_NET,"connection_add for listener failed. Giving up.");
goto err;