Merge branch 'maint-0.3.3'

This commit is contained in:
Nick Mathewson 2018-03-29 15:00:46 -04:00
commit e8c1d4c8b0

View File

@ -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 spaces). If this option is set, the hidden service is not accessible for
clients without authorization any more. Generated authorization data can be clients without authorization any more. Generated authorization data can be
found in the hostname file. Clients need to put this authorization data in 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**:: [[HiddenServiceAllowUnknownPorts]] **HiddenServiceAllowUnknownPorts** **0**|**1**::
If set to 1, then connections to unrecognized ports do not cause the 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 Every time the specified period elapses, Tor uploads any rendezvous
service descriptors to the directory servers. This information is also service descriptors to the directory servers. This information is also
uploaded whenever it changes. Minimum value allowed is 10 minutes and 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**:: [[HiddenServiceDirGroupReadable]] **HiddenServiceDirGroupReadable** **0**|**1**::
If this option is set to 1, allow the filesystem group to read the If this option is set to 1, allow the filesystem group to read the