summaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@torproject.org>2019-04-17 05:51:39 +0000
committerNick Mathewson <nickm@torproject.org>2019-05-13 14:30:35 -0400
commitf4064d6ce214b4b79017280a6c9db9b3f945ece1 (patch)
tree03a3ceebfc924c1f8cb052534c9597635e24e56e /doc/tor.1.txt
parent17a164a8275970aed53076ba58296ffc424c3b75 (diff)
downloadtor-f4064d6ce214b4b79017280a6c9db9b3f945ece1.tar.gz
tor-f4064d6ce214b4b79017280a6c9db9b3f945ece1.zip
Bug 28693: Provide Torrc option to disable circuit padding.
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f992172405..6c125e3741 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -955,6 +955,14 @@ The following options are useful only for clients (that is, if
this option. This option should be offered via the UI to mobile users
for use where bandwidth may be expensive. (Default: 0)
+[[CircuitPadding]] **CircuitPadding** **0**|**1**::
+ If set to 0, Tor will not pad client circuits with additional cover
+ traffic. Only clients may set this option. This option should be offered
+ via the UI to mobile users for use where bandwidth may be expensive. If
+ set to 1, padding will be negotiated as per the consensus and relay
+ support (unlike ConnectionPadding, CircuitPadding cannot be force-enabled).
+ (Default: 1)
+
[[ExcludeNodes]] **ExcludeNodes** __node__,__node__,__...__::
A list of identity fingerprints, country codes, and address
patterns of nodes to avoid when building a circuit. Country codes are