diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-06-26 08:34:56 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-06-26 08:34:56 -0400 |
commit | dbc2b75009a781f2664b871a6033d47b04946299 (patch) | |
tree | 0f9e01d158bb54534233dd2e0792175a057592df /doc | |
parent | 40922629fe92a947ef3d84e71826a5030884cf08 (diff) | |
parent | cb25f5772441e6caed4ae8b84300f32de078fe62 (diff) | |
download | tor-dbc2b75009a781f2664b871a6033d47b04946299.tar.gz tor-dbc2b75009a781f2664b871a6033d47b04946299.zip |
Merge branch 'assume_reachable_revamp'
Diffstat (limited to 'doc')
-rw-r--r-- | doc/tor.1.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a7b3a67879..327925b020 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2145,7 +2145,12 @@ is non-zero): don't do self-reachability testing; just upload your server descriptor immediately. If **AuthoritativeDirectory** is also set, this option instructs the dirserver to bypass remote reachability testing too and list - all connected servers as running. + all connected servers as running. (Default: 0) + +[[AssumeReachableIPv6]] **AssumeReachableIPv6** **0**|**1**|**auto**:: + Like **AssumeReachable**, but affects only the relay's own IPv6 ORPort. + If this value is set to "auto", then Tor will look at **AssumeReachable** + instead. (Default: auto) [[BridgeRelay]] **BridgeRelay** **0**|**1**:: Sets the relay to act as a "bridge" with respect to relaying connections |