aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2023-05-24 11:37:05 -0400
committerDavid Goulet <dgoulet@torproject.org>2023-05-24 11:37:05 -0400
commit9976da93679acc422c174f5e5b5bf890e387f1b1 (patch)
tree98410ddc3c152b3bb4f3c505374dd7fe16a99491 /doc
parent0781c2968d26fba999a00c3989c10964f492f9dc (diff)
parent032d850a2c48a1d4c767accc50ad92907309e9fc (diff)
downloadtor-9976da93679acc422c174f5e5b5bf890e387f1b1.tar.gz
tor-9976da93679acc422c174f5e5b5bf890e387f1b1.zip
Merge branch 'tor-gitlab/mr/709'
Diffstat (limited to 'doc')
-rw-r--r--doc/man/tor.1.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index f1fac2214c..19fdf90c90 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -354,6 +354,13 @@ forward slash (/) in the configuration file and on the command line.
supported at the moment. Default value is set to "auto" meaning the
consensus is used to decide unless set. (Default: auto)
+[[ConfluxClientUX]] **ConfluxClientUX** **throughput**|**latency**|**throughput_lowmem**|**latency_lowmem**::
+ This option configures the user experience that the client requests from
+ the exit, for data that the exit sends to the client. The default is
+ "throughput", which maximizes throughput. "Latency" will tell the exit to
+ only use the circuit with lower latency for all data. The lowmem versions
+ minimize queue usage memory at the client. (Default: "throughput")
+
[[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