diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-03 07:57:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-03 07:57:30 -0500 |
| commit | 9f35dd9e8a586d2a490a0d295a47bbbfe18c3ca2 (patch) | |
| tree | c4056d2a4dd154ff8e7077345d534d863f1bcc50 /doc | |
| parent | 6f1fe29e8de32e3651d92a296fbc81e50f5e740c (diff) | |
| parent | 2bd23cebf36f97f36fc61ee818be1bfede27d6fd (diff) | |
| download | tor-9f35dd9e8a586d2a490a0d295a47bbbfe18c3ca2.tar.gz tor-9f35dd9e8a586d2a490a0d295a47bbbfe18c3ca2.zip | |
Merge branch 'master' of git-rw.torproject.org:/tor
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ad6d941587..5f6186696b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1395,7 +1395,7 @@ The following options are useful only for clients (that is, if [[HTTPTunnelPort]] **HTTPTunnelPort** \['address':]__port__|**auto** [_isolation flags_]:: 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 to "auto" to have Tor pick a port for you. This directive can be 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 on Linux, or to use pf +rdr-to+ rules on *BSD systems. + + - (Default: "default".) + (Default: "default") [[NATDPort]] **NATDPort** \['address':]__port__|**auto** [_isolation flags_]:: 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, 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. - (Default: -1.) + (Default: -1) [[ClientBootstrapConsensusAuthorityDownloadSchedule]] **ClientBootstrapConsensusAuthorityDownloadSchedule** __N__,__N__,__...__:: 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 policy, set "ReducedExitPolicy 1". If you want to _replace_ the default 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. + + The default exit policy is: |