summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-11-22 07:15:30 -0500
committerRoger Dingledine <arma@torproject.org>2009-11-22 07:15:30 -0500
commit403f99eaa48b0374c9a21f624f81ecae521734b3 (patch)
tree50e3c0f67c80cdbc5a6a7ad8a410b375d8e61474 /doc
parent7f3f88bed38758d1f6f72cd0864cf93809bb5440 (diff)
downloadtor-403f99eaa48b0374c9a21f624f81ecae521734b3.tar.gz
tor-403f99eaa48b0374c9a21f624f81ecae521734b3.zip
add a minimum for CircuitStreamTimeout, plus a man page
plus some other unrelated touchups that have been sitting in my sandbox
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 1a71026aad..4bcab6d04d 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -466,6 +466,13 @@ circuit list.
(Default: 1 hour.)
.LP
.TP
+\fBCircuitStreamTimeout \fR\fINUM\fP
+If non-zero, this option overrides our internal timeout schedule for
+how many seconds until we detach a stream from a circuit and try a new
+circuit. If your network is particularly slow, you might want to set
+this to a number like 60. (Default: 0)
+.LP
+.TP
\fBClientOnly \fR\fB0\fR|\fB1\fR\fP
If set to 1, Tor will under no circumstances run as a server or serve
directory requests. The default