summaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-03-29 15:00:46 -0400
committerNick Mathewson <nickm@torproject.org>2018-03-29 15:00:46 -0400
commite8c1d4c8b05247e3e3cfec20ca11bafa5369bf41 (patch)
tree3f4056e5b033aaf4bb994b4c9706802e9d93057e /doc/tor.1.txt
parent2c1afc2defe4a86ebfe2ae205f201f6e85bf9dc7 (diff)
parent6aaafb0672ec7d2f454720ea0bed41fb91d9744e (diff)
downloadtor-e8c1d4c8b05247e3e3cfec20ca11bafa5369bf41.tar.gz
tor-e8c1d4c8b05247e3e3cfec20ca11bafa5369bf41.zip
Merge branch 'maint-0.3.3'
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 9fb95c8bc6..ccf6f8777b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2679,7 +2679,8 @@ The following options are used to configure a hidden service.
spaces). If this option is set, the hidden service is not accessible for
clients without authorization any more. Generated authorization data can be
found in the hostname file. Clients need to put this authorization data in
- their configuration file using **HidServAuth**.
+ their configuration file using **HidServAuth**. This option is only for v2
+ services.
[[HiddenServiceAllowUnknownPorts]] **HiddenServiceAllowUnknownPorts** **0**|**1**::
If set to 1, then connections to unrecognized ports do not cause the
@@ -2701,7 +2702,8 @@ The following options are used to configure a hidden service.
Every time the specified period elapses, Tor uploads any rendezvous
service descriptors to the directory servers. This information is also
uploaded whenever it changes. Minimum value allowed is 10 minutes and
- maximum is 3.5 days. (Default: 1 hour)
+ maximum is 3.5 days. This option is only for v2 services.
+ (Default: 1 hour)
[[HiddenServiceDirGroupReadable]] **HiddenServiceDirGroupReadable** **0**|**1**::
If this option is set to 1, allow the filesystem group to read the