diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-11-17 08:22:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-11-17 08:22:44 -0500 |
| commit | 6c610117819a99eb33403be08ed7a11567ca65f9 (patch) | |
| tree | 1ef59abc85d1cfa11fd6b30f62e2285e8fa03462 /src | |
| parent | 1b21d716ec4bcbcae68ba8aa3e81e4a9ff5ca483 (diff) | |
| parent | 09b3af578d3dd57f91d3d21c74e86a36c32cbd0e (diff) | |
| download | tor-6c610117819a99eb33403be08ed7a11567ca65f9.tar.gz tor-6c610117819a99eb33403be08ed7a11567ca65f9.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/184' into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/mainloop/connection.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 3d551c4ba8..41d67183aa 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -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; |