diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c044a765f5..5c88e86fb3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -805,10 +805,9 @@ GENERAL OPTIONS [[NoExec]] **NoExec** **0**|**1**:: If this option is set to 1, then Tor will never launch another - executable, regardless of the settings of PortForwardingHelper, - ClientTransportPlugin, or ServerTransportPlugin. Once this - option has been set to 1, it cannot be set back to 0 without - restarting Tor. (Default: 0) + executable, regardless of the settings of ClientTransportPlugin + or ServerTransportPlugin. Once this option has been set to 1, + it cannot be set back to 0 without restarting Tor. (Default: 0) [[Schedulers]] **Schedulers** **KIST**|**KISTLite**|**Vanilla**:: Specify the scheduler type that tor should use. The scheduler is @@ -1534,7 +1533,7 @@ The following options are useful only for clients (that is, if If no nodes in Tor2webRendezvousPoints are currently available for use, Tor will choose a random node when building HS circuits. -[[_HSLayer2Nodes]] **_HSLayer2Nodes** __node__,__node__,__...__:: +[[HSLayer2Nodes]] **HSLayer2Nodes** __node__,__node__,__...__:: A list of identity fingerprints, nicknames, country codes, and address patterns of nodes that are allowed to be used as the second hop in all client or service-side Onion Service circuits. @@ -1544,7 +1543,7 @@ The following options are useful only for clients (that is, if (Default: Any node in the network may be used in the second hop.) + (Example: - _HSLayer2Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + HSLayer2Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + When this is set, the resulting hidden service paths will look like: @@ -1561,7 +1560,7 @@ The following options are useful only for clients (that is, if Rend, HSDir, and Intro point selection is not affected by this option. + - This option may be combined with _HSLayer3Nodes to create + This option may be combined with HSLayer3Nodes to create paths of the form: + C - G - L2 - L3 - Rend + @@ -1571,7 +1570,7 @@ The following options are useful only for clients (that is, if S - G - L2 - L3 - HSDir + S - G - L2 - L3 - Intro + + - ExcludeNodes have higher priority than _HSLayer2Nodes, + ExcludeNodes have higher priority than HSLayer2Nodes, which means that nodes specified in ExcludeNodes will not be picked. + @@ -1579,10 +1578,10 @@ The following options are useful only for clients (that is, if https://github.com/mikeperry-tor/vanguards that selects and updates this set of nodes for you. Hence it does not do load balancing if fewer than 20 nodes are selected, and if no nodes in - _HSLayer2Nodes are currently available for use, Tor will not work. + HSLayer2Nodes are currently available for use, Tor will not work. Please use extreme care if you are setting this option manually. -[[_HSLayer3Nodes]] **_HSLayer3Nodes** __node__,__node__,__...__:: +[[HSLayer3Nodes]] **HSLayer3Nodes** __node__,__node__,__...__:: A list of identity fingerprints, nicknames, country codes, and address patterns of nodes that are allowed to be used as the third hop in all client and service-side Onion Service circuits. @@ -1592,7 +1591,7 @@ The following options are useful only for clients (that is, if (Default: Any node in the network may be used in the third hop.) + (Example: - _HSLayer3Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + HSLayer3Nodes ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) + + When this is set by itself, the resulting hidden service paths will look like: + @@ -1608,7 +1607,7 @@ The following options are useful only for clients (that is, if option. + While it is possible to use this option by itself, it should be - combined with _HSLayer2Nodes to create paths of the form: + combined with HSLayer2Nodes to create paths of the form: + C - G - L2 - L3 - Rend + C - G - L2 - L3 - M - HSDir + @@ -1617,7 +1616,7 @@ The following options are useful only for clients (that is, if S - G - L2 - L3 - HSDir + S - G - L2 - L3 - Intro + + - ExcludeNodes have higher priority than _HSLayer3Nodes, + ExcludeNodes have higher priority than HSLayer3Nodes, which means that nodes specified in ExcludeNodes will not be picked. + @@ -1625,7 +1624,7 @@ The following options are useful only for clients (that is, if https://github.com/mikeperry-tor/vanguards that selects and updates this set of nodes for you. Hence it does not do load balancing if fewer than 20 nodes are selected, and if no nodes in - _HSLayer3Nodes are currently available for use, Tor will not work. + HSLayer3Nodes are currently available for use, Tor will not work. Please use extreme care if you are setting this option manually. [[UseMicrodescriptors]] **UseMicrodescriptors** **0**|**1**|**auto**:: @@ -2087,18 +2086,6 @@ is non-zero): For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and IPv4Only and IPv6Only are mutually exclusive. -[[PortForwarding]] **PortForwarding** **0**|**1**:: - Attempt to automatically forward the DirPort and ORPort on a NAT router - connecting this Tor server to the Internet. If set, Tor will try both - NAT-PMP (common on Apple routers) and UPnP (common on routers from other - manufacturers). (Default: 0) - -[[PortForwardingHelper]] **PortForwardingHelper** __filename__|__pathname__:: - If PortForwarding is set, use this executable to configure the forwarding. - If set to a filename, the system path will be searched for the executable. - If set to a path, only the specified path will be executed. - (Default: tor-fw-helper) - [[PublishServerDescriptor]] **PublishServerDescriptor** **0**|**1**|**v3**|**bridge**,**...**:: This option specifies which descriptors Tor will publish when acting as a relay. You can |