diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-12 10:43:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-12 10:43:34 -0400 |
| commit | 26d462c1f0d4dd7ebd7f3f24c49a26e62e279b93 (patch) | |
| tree | 9f974ffe1721507edadee29e3def22abbb21521c /doc | |
| parent | 4027bd2e9680cb5922b006847aa4db6170826bf6 (diff) | |
| parent | 27fa4a98d23972213122fa99499efa4baebe49e3 (diff) | |
| download | tor-26d462c1f0d4dd7ebd7f3f24c49a26e62e279b93.tar.gz tor-26d462c1f0d4dd7ebd7f3f24c49a26e62e279b93.zip | |
Merge branch 'ticket21031'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c375e032d3..d49dd96336 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1408,12 +1408,6 @@ The following options are useful only for clients (that is, if addresses/ports. See SocksPort for an explanation of isolation flags. (Default: 0) -[[ClientDNSRejectInternalAddresses]] **ClientDNSRejectInternalAddresses** **0**|**1**:: - If true, Tor does not believe any anonymously retrieved DNS answer that - tells it that an address resolves to an internal address (like 127.0.0.1 or - 192.168.0.1). This option prevents certain browser-based attacks; don't - turn it off unless you know what you're doing. (Default: 1) - [[ClientRejectInternalAddresses]] **ClientRejectInternalAddresses** **0**|**1**:: If true, Tor does not try to fulfill requests to connect to an internal address (like 127.0.0.1 or 192.168.0.1) __unless a exit node is @@ -2468,7 +2462,7 @@ The following options are used for running a testing Tor network. 4 (for 40 seconds), 8, 16, 32, 60 ClientBootstrapConsensusMaxDownloadTries 80 ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 80 - ClientDNSRejectInternalAddresses 0 + TestingClientDNSRejectInternalAddresses 0 ClientRejectInternalAddresses 0 CountPrivateBandwidth 1 ExitPolicyRejectPrivate 0 @@ -2679,6 +2673,13 @@ The following options are used for running a testing Tor network. we replace it and issue a new key? (Default: 3 hours for link and auth; 1 day for signing.) +[[ClientDNSRejectInternalAddresses]] [[TestingClientDNSRejectInternalAddresses]] **TestingClientDNSRejectInternalAddresses** **0**|**1**:: + If true, Tor does not believe any anonymously retrieved DNS answer that + tells it that an address resolves to an internal address (like 127.0.0.1 or + 192.168.0.1). This option prevents certain browser-based attacks; don't + turn it off unless you know what you're doing. (Default: 1) + + NON-PERSISTENT OPTIONS ---------------------- |