diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-15 12:10:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-15 12:10:47 -0400 |
| commit | 37302e64a4c53975bfb300bd46024d1eb503bd11 (patch) | |
| tree | 4ab69dc47f429673c6d830107c5c1f21df58cbb2 /doc | |
| parent | fea2d84ce3eeba1d5ef07ece390a7677401a48d7 (diff) | |
| parent | f02fd6c3af71141241137403d070d72310cbfd82 (diff) | |
| download | tor-37302e64a4c53975bfb300bd46024d1eb503bd11.tar.gz tor-37302e64a4c53975bfb300bd46024d1eb503bd11.zip | |
Merge branch 'remove_allow_dotexit_v2'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 160eae536f..c719bf51e2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -954,7 +954,7 @@ The following options are useful only for clients (that is, if The ExcludeNodes option overrides this option: any node listed in both ExitNodes and ExcludeNodes is treated as excluded. + + - The .exit address notation, if enabled via AllowDotExit, overrides + The .exit address notation, if enabled via MapAddress, overrides this option. [[EntryNodes]] **EntryNodes** __node__,__node__,__...__:: @@ -1358,12 +1358,6 @@ The following options are useful only for clients (that is, if resolved. This helps trap accidental attempts to resolve URLs and so on. (Default: 0) -[[AllowDotExit]] **AllowDotExit** **0**|**1**:: - If enabled, we convert "www.google.com.foo.exit" addresses on the - SocksPort/TransPort/NATDPort into "www.google.com" addresses that exit from - the node "foo". Disabled by default since attacking websites and exit - relays can use it to manipulate your path selection. (Default: 0) - [[HTTPTunnelPort]] **HTTPTunnelPort** \['address':]__port__|**auto** [_isolation flags_]:: Open this port to listen for proxy connections using the "HTTP CONNECT" protocol instead of SOCKS. Set this to 0 |