nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.3'

Browse Source
This commit is contained in:
David Goulet 2020-03-26 09:15:01 -04:00
commit cf58b0b369
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug33608 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (client IPv6):
- Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections. Instead,
prefer IPv6 connections by default, but allow users to change their
configs using the "NoPreferIPv6" port flag.
Fixes bug 33608; bugfix on 0.4.3.1-alpha.

3
src/core/mainloop/connection.c
View File

@ -1514,10 +1514,11 @@ 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) { if (type != CONN_TYPE_AP_LISTENER) {
lis_conn->entry_cfg.ipv4_traffic = 1; lis_conn->entry_cfg.ipv4_traffic = 1;
lis_conn->entry_cfg.ipv6_traffic = 1; lis_conn->entry_cfg.ipv6_traffic = 1;
lis_conn->entry_cfg.prefer_ipv6 = 1;
} }
if (connection_add(conn) < 0) { /* no space, forget it */ if (connection_add(conn) < 0) { /* no space, forget it */