diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-03-31 21:26:41 +1100 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2016-08-24 14:40:53 -0400 |
| commit | 41cc1f612bd2112ab7cec0cc4fdeb68c26e231bf (patch) | |
| tree | e01739cc16cab77955622905ab1f693f3ef6c9de /doc | |
| parent | 00ec701f8343f5523de52d10b19fe637609f735e (diff) | |
| download | tor-41cc1f612bd2112ab7cec0cc4fdeb68c26e231bf.tar.gz tor-41cc1f612bd2112ab7cec0cc4fdeb68c26e231bf.zip | |
Parse *Port flags NoDNSRequest, NoOnionTraffic & OnionTrafficOnly
OnionTrafficOnly is equivalent to NoDNSRequest, NoIPv4Traffic,
and NoIPv6Traffic.
Add unit tests for parsing and checking option validity.
Add documentation for each flag to the man page.
Add changes file for all of #18693.
Parsing only: the flags do not change client behaviour (yet!)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 055073656b..2748f54546 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1083,7 +1083,18 @@ The following options are useful only for clients (that is, if IPv6.) **PreferIPv6**;; Tells exits that, if a host has both an IPv4 and an IPv6 address, - we would prefer to connect to it via IPv6. (IPv4 is the default.) + + we would prefer to connect to it via IPv6. (IPv4 is the default.) + **NoDNSRequest**;; + Do not ask exits to resolve DNS addresses in SOCKS5 requests. Tor will + connect to IPv4 addresses, IPv6 addresses (if IPv6Traffic is set) and + .onion addresses. + **NoOnionTraffic**;; + Do not connect to .onion addresses in SOCKS5 requests. + **OnionTrafficOnly**;; + Tell the tor client to only connect to .onion addresses in response to + SOCKS5 requests on this connection. This is equivalent to NoDNSRequest, + NoIPv4Traffic, NoIPv6Traffic. The corresponding NoOnionTrafficOnly + flag is not supported. **CacheIPv4DNS**;; Tells the client to remember IPv4 DNS answers we receive from exit nodes via this connection. (On by default.) @@ -1125,6 +1136,10 @@ The following options are useful only for clients (that is, if authentication" when IsolateSOCKSAuth is disabled, or when this option is set. + Flags are processed left to right. If flags conflict, the last flag on the + line is used, and all earlier flags are ignored. No error is issued for + conflicting flags. + [[SocksListenAddress]] **SocksListenAddress** __IP__[:__PORT__]:: Bind to this address to listen for connections from Socks-speaking applications. (Default: 127.0.0.1) You can also specify a port (e.g. |