diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-05-24 11:03:47 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-05-24 11:03:47 -0400 |
| commit | 6afe03aa5191f44192096b56ddb2f91b06ecb2ab (patch) | |
| tree | 416d9c16d42559a3deec772c625d46f9ae5db5e1 | |
| parent | 8eae9f17ae87e16ab7595544d858e9371d9068c2 (diff) | |
| parent | ffb764949e7c1699af715298ce65279a2ee5df6e (diff) | |
| download | tor-6afe03aa5191f44192096b56ddb2f91b06ecb2ab.tar.gz tor-6afe03aa5191f44192096b56ddb2f91b06ecb2ab.zip | |
Merge branch 'tor-gitlab/mr/708'
| -rw-r--r-- | changes/ticket40785 | 4 | ||||
| -rw-r--r-- | doc/man/tor.1.txt | 2 | ||||
| -rw-r--r-- | src/app/config/config.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/changes/ticket40785 b/changes/ticket40785 new file mode 100644 index 0000000000..998120011d --- /dev/null +++ b/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. + diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 2ac6a8471c..f1fac2214c 100644 --- a/doc/man/tor.1.txt +++ b/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 diff --git a/src/app/config/config.c b/src/app/config/config.c index 24321b764f..fff82be1b7 100644 --- a/src/app/config/config.c +++ b/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"), |