diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-01 10:28:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-01 10:28:01 -0400 |
| commit | 12dc55f4878d16bfc3fb6789b31494d47df7ccec (patch) | |
| tree | fc98af22b5c8ec89902f579fba8ffb9e2d3d77fe /doc | |
| parent | dde41fa1b00151e01e11341903069f5b2f0db1b7 (diff) | |
| parent | 5de88dda0acda6914bacd1e14c2e037798c5d9d9 (diff) | |
| download | tor-12dc55f4878d16bfc3fb6789b31494d47df7ccec.tar tor-12dc55f4878d16bfc3fb6789b31494d47df7ccec.tar.gz | |
Merge branch 'prop221_squashed_024'
Conflicts:
src/or/or.h
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5dc17b5f3..86928718a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1140,15 +1140,17 @@ The following options are useful only for clients (that is, if the node "foo". Disabled by default since attacking websites and exit relays can use it to manipulate your path selection. (Default: 0) -[[FastFirstHopPK]] **FastFirstHopPK** **0**|**1**:: +[[FastFirstHopPK]] **FastFirstHopPK** **0**|**1**|**auto**:: When this option is disabled, Tor uses the public key step for the first hop of creating circuits. Skipping it is generally safe since we have already used TLS to authenticate the relay and to establish forward-secure - keys. Turning this option off makes circuit building slower. + + keys. Turning this option off makes circuit building a little + slower. Setting this option to "auto" takes advice from the authorities + in the latest consensus about whether to use this feature. + + Note that Tor will always use the public key step for the first hop if it's operating as a relay, and it will never use the public key step if it - doesn't yet know the onion key of the first hop. (Default: 1) + doesn't yet know the onion key of the first hop. (Default: auto) [[TransPort]] **TransPort** \['address':]__port__|**auto** [_isolation flags_]:: Open this port to listen for transparent proxy connections. Set this to |