[tor-commits] [tor/master] manpge: reorder some padding-related options

[nickm at torproject.org]

commit cfd21cc213ee8202ce03db9a4ff1098c8f38e2ec
Author: Taylor Yu <catalyst at torproject.org>
Date:   Thu Jan 9 10:57:40 2020 -0600

    manpge: reorder some padding-related options
    
    Move ReducedCircuitPadding and ReducedConnectionPadding immediately
    after the corresponding non-Reduced options.  Part of ticket 32846.
---
 doc/tor.1.txt | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 26098f734..eea303ce8 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1018,6 +1018,13 @@ The following options are useful only for clients (that is, if
     support (unlike ConnectionPadding, CircuitPadding cannot be force-enabled).
     (Default: 1)
 
+// Out of order because it logically belongs after CircuitPadding
+[[ReducedCircuitPadding]] **ReducedCircuitPadding** **0**|**1**::
+    If set to 1, Tor will only use circuit padding algorithms that have low
+    overhead. Only clients may set this option. This option should be offered
+    via the UI to mobile users for use where bandwidth may be expensive.
+    (Default: 0)
+
 [[CircuitsAvailableTimeout]] **CircuitsAvailableTimeout** __NUM__::
     Tor will attempt to keep at least one open, unused circuit available for
     this amount of time. This option governs how long idle circuits are kept
@@ -1142,6 +1149,13 @@ The following options are useful only for clients (that is, if
     for use where bandwidth may be expensive.
     (Default: auto)
 
+// Out of order because it logically belongs after ConnectionPadding
+[[ReducedConnectionPadding]] **ReducedConnectionPadding** **0**|**1**::
+    If set to 1, Tor will not not hold OR connections open for very long,
+    and will send less padding on these connections. Only clients may set
+    this option. This option should be offered via the UI to mobile users
+    for use where bandwidth may be expensive. (Default: 0)
+
 [[DNSPort]] **DNSPort** ['address'**:**]{empty}__port__|**auto** [_isolation flags_]::
     If non-zero, open this port to listen for UDP DNS requests, and resolve
     them anonymously.  This port only handles A, AAAA, and PTR requests---it
@@ -1649,18 +1663,6 @@ The following options are useful only for clients (that is, if
     and some limit HTTP GET requests (which Tor uses for fetching directory
     information) to port 80.
 
-[[ReducedCircuitPadding]] **ReducedCircuitPadding** **0**|**1**::
-    If set to 1, Tor will only use circuit padding algorithms that have low
-    overhead. Only clients may set this option. This option should be offered
-    via the UI to mobile users for use where bandwidth may be expensive.
-    (Default: 0)
-
-[[ReducedConnectionPadding]] **ReducedConnectionPadding** **0**|**1**::
-    If set to 1, Tor will not not hold OR connections open for very long,
-    and will send less padding on these connections. Only clients may set
-    this option. This option should be offered via the UI to mobile users
-    for use where bandwidth may be expensive. (Default: 0)
-
 [[RejectPlaintextPorts]] **RejectPlaintextPorts** __port__,__port__,__...__::
     Like WarnPlaintextPorts, but instead of warning about risky port uses, Tor
     will instead refuse to make the connection. (Default: None)