diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-05-06 17:16:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-05-06 17:16:37 -0400 |
| commit | c8c64caf371c2960bf217fc10d2353144e7e24b3 (patch) | |
| tree | 95b62345f9a3a1a862c7c6b743718fbb879deaae /doc | |
| parent | 2aa441b88e089c9aa650f25dd1b109bf14bc451d (diff) | |
| parent | 8cfab3b7c3ed626b8f17018a627634de9b4502af (diff) | |
| download | tor-c8c64caf371c2960bf217fc10d2353144e7e24b3.tar.gz tor-c8c64caf371c2960bf217fc10d2353144e7e24b3.zip | |
Merge remote-tracking branch 'tor-github/pr/923'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index cbbc3515bb..252a788ebc 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1056,8 +1056,8 @@ The following options are useful only for clients (that is, if [[StrictNodes]] **StrictNodes** **0**|**1**:: If StrictNodes is set to 1, Tor will treat solely the ExcludeNodes option as a requirement to follow for all the circuits you generate, even if - doing so will break functionality for you (StrictNodes applies to neither - ExcludeExitNodes nor to ExitNodes, nor to MiddleNodes). If StrictNodes + doing so will break functionality for you (StrictNodes does not apply to + ExcludeExitNodes, ExitNodes, MiddleNodes, or MapAddress). If StrictNodes is set to 0, Tor will still try to avoid nodes in the ExcludeNodes list, but it will err on the side of avoiding unexpected errors. Specifically, StrictNodes 0 tells Tor that it is okay to use an excluded @@ -1153,7 +1153,9 @@ The following options are useful only for clients (that is, if "MapAddress \*.example.com \*.example.com.torserver.exit". (Note the leading "*." in each part of the directive.) You can also redirect all subdomains of a domain to a single address. For example, "MapAddress - *.example.com www.example.com". + + *.example.com www.example.com". If the specified exit is not available, + or the exit can not connect to the site, Tor will fail any connections + to the mapped address.+ + NOTES: @@ -1181,6 +1183,15 @@ The following options are useful only for clients (that is, if 4. Using a wildcard to match only part of a string (as in *ample.com) is also invalid. + 5. Tor maps hostnames and IP addresses separately. If you MapAddress + a DNS name, but use an IP address to connect, then Tor will ignore the + DNS name mapping. + + 6. MapAddress does not apply to redirects in the application protocol. + For example, HTTP redirects and alt-svc headers will ignore mappings + for the original address. You can use a wildcard mapping to handle + redirects within the same site. + [[NewCircuitPeriod]] **NewCircuitPeriod** __NUM__:: Every NUM seconds consider whether to build a new circuit. (Default: 30 seconds) |