diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-04-05 08:21:43 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-04-05 08:21:43 -0400 |
commit | 43f31555827319077858fb3872c28764961b944a (patch) | |
tree | ae0c8461952c63ead8cb48d18f26e7219d182e84 /doc | |
parent | 52846f728d92b44cda1a7cab1bfa53b2450a29b9 (diff) | |
parent | ac3e389dbd7224a23dfa12da7a15b748feb88435 (diff) | |
download | tor-43f31555827319077858fb3872c28764961b944a.tar.gz tor-43f31555827319077858fb3872c28764961b944a.zip |
Merge branch 'maint-0.3.3'
Diffstat (limited to 'doc')
-rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ccf6f8777b..33d5c9c645 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1203,6 +1203,7 @@ The following options are useful only for clients (that is, if on different SocksPorts, TransPorts, etc are always isolated from one another. This option overrides that behavior.) +// Anchor only for formatting, not visible in the man page. [[OtherSocksPortFlags]]:: Other recognized __flags__ for a SocksPort are: **NoIPv4Traffic**;; @@ -1267,6 +1268,7 @@ The following options are useful only for clients (that is, if authentication" when IsolateSOCKSAuth is disabled, or when this option is set. +// Anchor only for formatting, not visible in the man page. [[SocksPortFlagsMisc]]:: 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 @@ -1904,7 +1906,8 @@ is non-zero): reject *:6881-6999 accept *:* -[[ExitPolicyDefault]] **ExitPolicyDefault**:: +// Anchor only for formatting, not visible in the man page. +[[ExitPolicyDefault]]:: Since the default exit policy uses accept/reject *, it applies to both IPv4 and IPv6 addresses. @@ -2079,6 +2082,7 @@ is non-zero): If the address is absent, or resolves to both an IPv4 and an IPv6 address, only listen to the IPv6 address. +// Anchor only for formatting, not visible in the man page. [[ORPortFlagsExclusive]]:: For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and IPv4Only and IPv6Only are mutually exclusive. |