aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-12-24 01:28:35 -0800
committerRobert Ransom <rransom.8774@gmail.com>2011-12-27 08:02:41 -0800
commitc6a8ee36fb42e5012704c2428772491ddf3057a6 (patch)
tree664faa4123cfc26df481ad85aaeafc6760a49686 /doc
parent4c3a23b283774f02fbc35f70c72256c6469071d3 (diff)
downloadtor-c6a8ee36fb42e5012704c2428772491ddf3057a6.tar
tor-c6a8ee36fb42e5012704c2428772491ddf3057a6.tar.gz
Move description of HidServAuth out of the FascistFirewall group
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt20
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 56621315e..b373678d9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -644,16 +644,6 @@ The following options are useful only for clients (that is, if
**FascistFirewall** is set. This option is deprecated; use ReachableAddresses
instead. (Default: 80, 443)
-**HidServAuth** __onion-address__ __auth-cookie__ [__service-name__]::
- Client authorization for a hidden service. Valid onion addresses contain 16
- characters in a-z2-7 plus ".onion", and valid auth cookies contain 22
- characters in A-Za-z0-9+/. The service name is only used for internal
- purposes, e.g., for Tor controllers. This option may be used multiple times
- for different hidden services. If a hidden service uses authorization and
- this option is not set, the hidden service is not accessible. Hidden
- services can be configured to require authorization using the
- **HiddenServiceAuthorizeClient** option.
-
**ReachableAddresses** __ADDR__[/__MASK__][:__PORT__]...::
A comma-separated list of IP addresses and ports that your firewall allows
you to connect to. The format is as for the addresses in ExitPolicy, except
@@ -683,6 +673,16 @@ The following options are useful only for clients (that is, if
and some limit HTTP GET requests (which Tor uses for fetching directory
information) to port 80.
+**HidServAuth** __onion-address__ __auth-cookie__ [__service-name__]::
+ Client authorization for a hidden service. Valid onion addresses contain 16
+ characters in a-z2-7 plus ".onion", and valid auth cookies contain 22
+ characters in A-Za-z0-9+/. The service name is only used for internal
+ purposes, e.g., for Tor controllers. This option may be used multiple times
+ for different hidden services. If a hidden service uses authorization and
+ this option is not set, the hidden service is not accessible. Hidden
+ services can be configured to require authorization using the
+ **HiddenServiceAuthorizeClient** option.
+
**LongLivedPorts** __PORTS__::
A list of ports for services that tend to have long-running connections
(e.g. chat and interactive shells). Circuits for streams that use these