tor

commit cf58b0b369605168c0c72994d600147fa477a5b1
parent b2cda32693af9d98d388577b7cc318c5fabd8ae5
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 26 Mar 2020 09:15:01 -0400

Merge branch 'maint-0.4.3'

Diffstat:
A
changes/bug33608
 | 
5
+++++
M
src/core/mainloop/connection.c
 | 
3
++-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changes/bug33608 b/changes/bug33608
@@ -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.
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
@@ -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) {
     lis_conn->entry_cfg.ipv4_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 */