summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2018-09-20 20:59:42 +0200
committerAlexander Færøy <ahf@torproject.org>2018-09-20 20:59:42 +0200
commit8ecaf41003cc5b513cf26c4ae176d5043f5a6a93 (patch)
treef92ed331e7dace0f534180df975b8e0d7e50e031 /doc
parent3477a73af99eb72f8374928fdc2fab4858485219 (diff)
downloadtor-8ecaf41003cc5b513cf26c4ae176d5043f5a6a93.tar.gz
tor-8ecaf41003cc5b513cf26c4ae176d5043f5a6a93.zip
Support 'none' in torrc for HiddenServiceExportCircuitID.
See: https://bugs.torproject.org/4700
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d260eec10d..df298e1d77 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2838,7 +2838,8 @@ The following options are used to configure a hidden service.
[[HiddenServiceExportCircuitID]] **HiddenServiceExportCircuitID** __protocol__::
The onion service will use the given protocol to expose the global circuit
identifier of each inbound client circuit via the selected protocol. The only
- protocol supported right now \'haproxy\'. This option is only for v3 services.
+ protocol supported right now \'haproxy\'. This option is only for v3
+ services. (Default: none)
[[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__::
The maximum number of simultaneous streams (connections) per rendezvous