commit 1e3f53d613182471d4daed1f34462929bf24f308 Author: Taylor Yu <catalyst@torproject.org> Date: Mon Dec 9 14:54:24 2019 -0600 manpage: minor formatting fixes These are unrelated changes done by Swati while doing the alphabetizing. Part of ticket 32708. --- doc/tor.1.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 7e70bb67e..bcc78f765 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -236,7 +236,7 @@ GENERAL OPTIONS When using OpenSSL hardware crypto acceleration attempt to load the dynamic engine of this name. This must be used for any dynamic hardware engine. Names can be verified with the openssl engine command. Can not be changed - while tor is running. + while tor is running. + + If the engine name is prefixed with a "!", then Tor will exit if the engine cannot be loaded. @@ -384,7 +384,7 @@ GENERAL OPTIONS bind to multiple address/port pairs. Set it to "auto" to have Tor pick a port for you. (Default: 0) + + - Recognized flags are... + Recognized flags are: **GroupWritable**;; Unix domain sockets only: makes the socket get created as group-writable. @@ -825,14 +825,14 @@ GENERAL OPTIONS **ExtORPortCookieAuthFile**, **Logs**, **ServerDNSResolvConfFile**, - **ClientOnionAuthDir** (and any files in it won't reload on HUP signal). + **ClientOnionAuthDir** (and any files in it won't reload on HUP signal). + + Launching new Onion Services through the control port is not supported - with current syscall sandboxing implementation. + with current syscall sandboxing implementation. + + Tor must remain in client or server mode (some changes to **ClientOnly** and **ORPort** are not allowed). Currently, if **Sandbox** is 1, - **ControlPort** command "GETINFO address" will not work. + **ControlPort** command "GETINFO address" will not work. + + (Default: 0) @@ -843,7 +843,7 @@ GENERAL OPTIONS unavailable, the second one is tried and so on. It is possible to change these values at runtime. This option mostly effects relays, and most operators should leave it set to its default value. - (Default: KIST,KISTLite,Vanilla) + (Default: KIST,KISTLite,Vanilla) + + The possible scheduler types are: + @@ -852,13 +852,13 @@ GENERAL OPTIONS and when to send it. KIST also handles traffic in batches (see KISTSchedRunInterval) in order to improve traffic prioritization decisions. As implemented, KIST will only work on Linux kernel version 2.6.39 or - higher. + higher. + + **KISTLite**: Same as KIST but without kernel support. Tor will use all the same mechanics as with KIST, including the batching, but its decisions regarding how much data to send will not be as good. KISTLite will work on all kernels and operating systems, and the majority of the benefits of KIST - are still realized with KISTLite. + are still realized with KISTLite. + + **Vanilla**: The scheduler that Tor used before KIST was implemented. It sends as much data as possible, as soon as possible. Vanilla will work on