nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 00:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git-rw.torproject.org:/tor

Browse Source
This commit is contained in:
Nick Mathewson 2018-03-03 07:57:30 -05:00
commit 9f35dd9e8a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/tor.1.txt
View File

@ -1395,7 +1395,7 @@ The following options are useful only for clients (that is, if
[[HTTPTunnelPort]] **HTTPTunnelPort** \['address':]__port__|**auto** [_isolation flags_]:: [[HTTPTunnelPort]] **HTTPTunnelPort** \['address':]__port__|**auto** [_isolation flags_]::
Open this port to listen for proxy connections using the "HTTP CONNECT" Open this port to listen for proxy connections using the "HTTP CONNECT"
protocol instead of SOCKS. Set this to 0 protocol instead of SOCKS. Set this to
0 if you don't want to allow "HTTP CONNECT" connections. Set the port 0 if you don't want to allow "HTTP CONNECT" connections. Set the port
to "auto" to have Tor pick a port for you. This directive can be to "auto" to have Tor pick a port for you. This directive can be
specified multiple times to bind to multiple addresses/ports. See specified multiple times to bind to multiple addresses/ports. See
@ -1435,7 +1435,7 @@ The following options are useful only for clients (that is, if
Set this to "default", or leave it unconfigured, to use regular IPTables Set this to "default", or leave it unconfigured, to use regular IPTables
on Linux, or to use pf +rdr-to+ rules on *BSD systems. + on Linux, or to use pf +rdr-to+ rules on *BSD systems. +
+ +
(Default: "default".) (Default: "default")
[[NATDPort]] **NATDPort** \['address':]__port__|**auto** [_isolation flags_]:: [[NATDPort]] **NATDPort** \['address':]__port__|**auto** [_isolation flags_]::
Open this port to listen for connections from old versions of ipfw (as Open this port to listen for connections from old versions of ipfw (as
@ -1728,7 +1728,7 @@ The following options are useful only for clients (that is, if
prevent your Tor client from bootstrapping. If this option is negative, prevent your Tor client from bootstrapping. If this option is negative,
Tor will use a default value chosen by the directory authorities. If the Tor will use a default value chosen by the directory authorities. If the
directory authorities do not choose a value, Tor will default to 0.6. directory authorities do not choose a value, Tor will default to 0.6.
(Default: -1.) (Default: -1)
[[ClientBootstrapConsensusAuthorityDownloadSchedule]] **ClientBootstrapConsensusAuthorityDownloadSchedule** __N__,__N__,__...__:: [[ClientBootstrapConsensusAuthorityDownloadSchedule]] **ClientBootstrapConsensusAuthorityDownloadSchedule** __N__,__N__,__...__::
Schedule for when clients should download consensuses from authorities Schedule for when clients should download consensuses from authorities
@ -1894,7 +1894,7 @@ is non-zero):
If you want to use a reduced exit policy rather than the default exit If you want to use a reduced exit policy rather than the default exit
policy, set "ReducedExitPolicy 1". If you want to _replace_ the default policy, set "ReducedExitPolicy 1". If you want to _replace_ the default
exit policy with your custom exit policy, end your exit policy with either exit policy with your custom exit policy, end your exit policy with either
a reject *:* or an accept *:*. Otherwise, you’re _augmenting_ (prepending a reject *:* or an accept *:*. Otherwise, you're _augmenting_ (prepending
to) the default or reduced exit policy. + to) the default or reduced exit policy. +
+ +
The default exit policy is: The default exit policy is: