From eac2bad86b6491b73b0086528b2b2cffe6c0d862 Mon Sep 17 00:00:00 2001 From: Mike Perry Date: Tue, 7 Mar 2023 19:11:38 +0000 Subject: Prop#329 params: Consensus parameter and torrc handling Signed-off-by: David Goulet --- doc/man/tor.1.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index e81b290b55..57992cd8d2 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -348,6 +348,12 @@ forward slash (/) in the configuration file and on the command line. forwards its traffic to it. It's the duty of that proxy to properly forward the traffic to the bridge. (Default: none) +[[ConfluxEnabled]] **ConfluxEnabled** **0**|**1**|**auto**:: + If this option is set to 1, general purpose traffic will use Conflux which + is traffic splitting among multiple legs (circuits). Onion services are not + supported at the moment. Default value is set to "auto" meaning the + consensus is used to decide unless set. (Default: auto) + [[ConnLimit]] **ConnLimit** __NUM__:: The minimum number of file descriptors that must be available to the Tor process before it will start. Tor will ask the OS for as many file -- cgit v1.2.3-54-g00ecf