summaryrefslogtreecommitdiff
path: root/doc/tor.1.in
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-09-23 20:13:43 +0000
committerNick Mathewson <nickm@torproject.org>2008-09-23 20:13:43 +0000
commit9d296f7701cfa35d4faacba679808f5ad65081b5 (patch)
tree9d7e12518b6bce7b3489c2428949a0129701eb03 /doc/tor.1.in
parentc4397f6257787f6cd38ce643b248d08b0d13e7cd (diff)
downloadtor-9d296f7701cfa35d4faacba679808f5ad65081b5.tar.gz
tor-9d296f7701cfa35d4faacba679808f5ad65081b5.zip
(backport to 0.2.0.x) Fix for bug 797 (by arma, with tweaks): always use create_fast for circuits where we do not know an onion key.
svn:r16943
Diffstat (limited to 'doc/tor.1.in')
-rw-r--r--doc/tor.1.in13
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 90ae989c89..54b4855842 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -663,11 +663,14 @@ resolved. This helps trap accidental attempts to resolve URLs and so on.
.LP
.TP
\fBFastFirstHopPK \fR\fB0\fR|\fB1\fR\fP
-When this option is enabled and we aren't running as a server, Tor
-skips the public key step for the first hop of creating circuits. This is
-safe since we have already used TLS to authenticate the server and to
-establish forward-secure keys. Turning this option off makes circuit
-building slower.
+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.
+
+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)
.LP
.TP