diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-05-13 14:33:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-05-13 14:33:31 -0400 |
| commit | 9ad2eb8f73b70292e36511424d676b223d4cdff0 (patch) | |
| tree | 844aa082c47e7d4a76befda6fdc7dc668f8e4284 /doc | |
| parent | c6523a6398efb07831ede8234486ee8f385ed558 (diff) | |
| parent | 507df74b319f37462d1540495f04b9b0838cb3a3 (diff) | |
| download | tor-9ad2eb8f73b70292e36511424d676b223d4cdff0.tar.gz tor-9ad2eb8f73b70292e36511424d676b223d4cdff0.zip | |
Merge branch 'bug28683_30173_29203_squashed'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 252a788ebc..8cb85fc351 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -955,6 +955,20 @@ 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) + +[[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) + [[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 |