summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-02-24 07:45:20 -0500
committerNick Mathewson <nickm@torproject.org>2020-02-24 07:45:20 -0500
commitcaa392a73ad6c8e215a4686955c9de98eeb07661 (patch)
tree50de29ea7cbbf27ae656a4b7a865f76c1a66ae63 /doc
parent7ba7f9c0de9d1b2435a01961379b3d85c4fc2ab5 (diff)
parent93cb8072becb4213525d08a87fdf7284e6257168 (diff)
downloadtor-caa392a73ad6c8e215a4686955c9de98eeb07661.tar.gz
tor-caa392a73ad6c8e215a4686955c9de98eeb07661.zip
Merge remote-tracking branch 'tor-github/pr/1685/head'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d4ceae1876..52beb3221c 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -3193,6 +3193,19 @@ The next section describes the per service options that can only be set
The HAProxy version 1 protocol is described in detail at
https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt
+[[HiddenServiceOnionBalanceInstance]] **HiddenServiceOnionBalanceInstance** **0**|**1**::
+
+ If set to 1, this onion service becomes an OnionBalance instance and will
+ accept client connections destined to an OnionBalance frontend. In this
+ case, Tor expects to find a file named "ob_config" inside the
+ **HiddenServiceDir** directory with content:
+ +
+ MasterOnionAddress <frontend_onion_address>
+ +
+ where <frontend_onion_address> is the onion address of the OnionBalance
+ frontend (e.g. wrxdvcaqpuzakbfww5sxs6r2uybczwijzfn2ezy2osaj7iox7kl7nhad.onion).
+
+
[[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__::
The maximum number of simultaneous streams (connections) per rendezvous
circuit. The maximum value allowed is 65535. (Setting this to 0 will allow