diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-01-15 09:09:03 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-01-15 09:09:03 +0000 |
| commit | 37b5132ad8cf864c4737db8b7e23c27c77e5bfec (patch) | |
| tree | cb0699011de170d481231037a5e414c799c9cdf3 /doc/tor.1.in | |
| parent | a9c250837e86eecf503c79ab139c805301320667 (diff) | |
| download | tor-37b5132ad8cf864c4737db8b7e23c27c77e5bfec.tar.gz tor-37b5132ad8cf864c4737db8b7e23c27c77e5bfec.zip | |
Expire socks connections if they spend too long waiting for the
handshake to finish. Previously we would let them sit around for
days, if the connecting application didn't close them either.
Also take this opportunity to refactor a duplicate bit of circuituse.c.
And change the semantics of SocksTimeout slightly, but I think it'll
be ok.
svn:r9350
Diffstat (limited to 'doc/tor.1.in')
| -rw-r--r-- | doc/tor.1.in | 3 |
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 |