diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-29 15:02:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-29 15:02:11 -0400 |
| commit | bbaa7d09a045130560a2f5da579671c5e02c9cd7 (patch) | |
| tree | 232540453f40eb00b2dc0492b236967f383627e8 /doc | |
| parent | f46ce6e3d8bea3cf00388c87c29cdcafd4bab350 (diff) | |
| parent | 19816f2f782568722964d35ee132af441a809db3 (diff) | |
| download | tor-bbaa7d09a045130560a2f5da579671c5e02c9cd7.tar.gz tor-bbaa7d09a045130560a2f5da579671c5e02c9cd7.zip | |
Merge remote-tracking branch 'teor/reject-tap-v6'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ebf16f3397..0687991e1f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1452,16 +1452,6 @@ The following options are useful only for clients (that is, if "auto" (recommended) then it is on for all clients that do not set FetchUselessDescriptors. (Default: auto) -[[UseNTorHandshake]] **UseNTorHandshake** **0**|**1**|**auto**:: - The "ntor" circuit-creation handshake is faster and (we think) more - secure than the original ("TAP") circuit handshake, but starting to use - it too early might make your client stand out. If this option is 0, your - Tor client won't use the ntor handshake. If it's 1, your Tor client - will use the ntor handshake to extend circuits through servers that - support it. If this option is "auto", then your client - will use the ntor handshake once enough directory authorities recommend - it. (Default: 1) - [[PathBiasCircThreshold]] **PathBiasCircThreshold** __NUM__ + [[PathBiasNoticeRate]] **PathBiasNoticeRate** __NUM__ + |