diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-01 20:32:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-01 20:32:18 -0500 |
| commit | 2b2b97484ad07c91ac410735a96fe8710e60cf23 (patch) | |
| tree | 1e484c79478f34faea52da03e7bb262fa421d318 /doc | |
| parent | 701eaef980de4f7dbb5c31c4fee9b7e1e266d7a1 (diff) | |
| parent | ad031b64ce355ac3af15adb716a4322858dce4a8 (diff) | |
| download | tor-2b2b97484ad07c91ac410735a96fe8710e60cf23.tar.gz tor-2b2b97484ad07c91ac410735a96fe8710e60cf23.zip | |
Merge branch 'ticket27490a_squashed'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e94382b66b..6d3429abd1 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1749,6 +1749,12 @@ The following options are useful only for clients (that is, if other clients prefer IPv4. Other things may influence the choice. This option breaks a tie to the favor of IPv6. (Default: auto) +[[ClientAutoIPv6ORPort]] **ClientAutoIPv6ORPort** **0**|**1**:: + If this option is set to 1, Tor clients randomly prefer a node's IPv4 or + IPv6 ORPort. The random preference is set every time a node is loaded + from a new consensus or bridge config. When this option is set to 1, + **ClientPreferIPv6ORPort** is ignored. (Default: 0) + [[PathsNeededToBuildCircuits]] **PathsNeededToBuildCircuits** __NUM__:: Tor clients don't build circuits for user traffic until they know about enough of the network so that they could potentially construct |