Merge branch 'tor-gitlab/mr/708'

changes/ticket40785

@@ -0,0 +1,4 @@
+  o Minor feature (client, IPv6):
+    - Make client able to pick IPv6 relays by default now meaning ClientUseIPv6
+      option now defaults to 1. Closes ticket 40785.
+

doc/man/tor.1.txt

@@ -1180,7 +1180,7 @@ The following options are useful only for clients (that is, if
     entry nodes over IPv6. For IPv6 only hosts, you need to also set
     **ClientUseIPv4** to 0 to disable IPv4. Note that clients configured with
     an IPv6 address in a **Bridge**, proxy, or pluggable transportline will
-    try connecting over IPv6 even if **ClientUseIPv6** is set to 0. (Default: 0)
+    try connecting over IPv6 even if **ClientUseIPv6** is set to 0. (Default: 1)
 
 [[ConnectionPadding]] **ConnectionPadding** **0**|**1**|**auto**::
     This option governs Tor's use of padding to defend against some forms of

src/app/config/config.c

@@ -377,7 +377,7 @@ static const config_var_t option_vars_[] = {
   OBSOLETE("ClientAutoIPv6ORPort"),
   V(ClientRejectInternalAddresses, BOOL,   "1"),
   V(ClientTransportPlugin,       LINELIST, NULL),
-  V(ClientUseIPv6,               BOOL,     "0"),
+  V(ClientUseIPv6,               BOOL,     "1"),
   V(ClientUseIPv4,               BOOL,     "1"),
   V(ConfluxEnabled,              AUTOBOOL, "auto"),
   V(ConnLimit,                   POSINT,     "1000"),