summaryrefslogtreecommitdiff
path: root/doc/tor.1.in
diff options
context:
space:
mode:
Diffstat (limited to 'doc/tor.1.in')
-rw-r--r--doc/tor.1.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 76f7c03636..d73f104d5d 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -461,7 +461,8 @@ The policies have the same form as exit policies below.
.LP
.TP
\fBSocksTimeout \fR\fINUM\fP
-Let a socks connection wait NUM seconds unattached before we fail it.
+Let a socks connection wait NUM seconds handshaking, and NUM seconds
+unattached waiting for an appropriate circuit, before we fail it.
(Default: 2 minutes.)
.LP
.TP