diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-03-21 23:30:24 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-03-21 23:30:24 +0000 |
| commit | 442c054a7114fd8818c292cc81698f5479c53f4a (patch) | |
| tree | c0192b6e5cd78a47eef16ae0fc199c20e7ad5c6c | |
| parent | 28fafb9022930e29658093c0670f670037ae28b6 (diff) | |
| download | tor-442c054a7114fd8818c292cc81698f5479c53f4a.tar.gz tor-442c054a7114fd8818c292cc81698f5479c53f4a.zip | |
and add SocksTimeout to the man page
and stop shouting when we talk about Socks
svn:r6218
| -rw-r--r-- | doc/tor.1.in | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in index 12cd0dd561..4f7ad98ecd 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -224,7 +224,7 @@ available. This is untested and probably buggy. (Default: 0) .SH CLIENT OPTIONS .PP -The following options are useful only for clients (that is, if \fBSOCKSPort\fP is non-zero): +The following options are useful only for clients (that is, if \fBSocksPort\fP is non-zero): .LP .TP \fBAllowInvalidNodes\fR \fBentry\fR|\fBexit\fR|\fBmiddle\fR|\fBintroduction\fR|\fBrendezvous\fR|...\fP @@ -359,24 +359,30 @@ A list of preferred nodes to use for the rendezvous point, if possible. A list of nodes to never use when choosing a rendezvous point. .LP .TP -\fBSOCKSPort \fR\fIPORT\fP -Advertise this port to listen for connections from SOCKS-speaking +\fBSocksPort \fR\fIPORT\fP +Advertise this port to listen for connections from Socks-speaking applications. Set this to 0 if you don't want to allow application connections. (Default: 9050) .LP .TP -\fBSOCKSListenAddress \fR\fIIP\fR[:\fIPORT\fR]\fP -Bind to this address to listen for connections from SOCKS-speaking +\fBSocksListenAddress \fR\fIIP\fR[:\fIPORT\fR]\fP +Bind to this address to listen for connections from Socks-speaking applications. (Default: 127.0.0.1) You can also specify a port (e.g. 192.168.0.1:9100). This directive can be specified multiple times to bind to multiple addresses/ports. .LP .TP -\fBSOCKSPolicy \fR\fIpolicy\fR,\fIpolicy\fR,\fI...\fP -Set an entrance policy for this server, to limit who can connect to the SOCKS ports. +\fBSocksPolicy \fR\fIpolicy\fR,\fIpolicy\fR,\fI...\fP +Set an entrance policy for this server, to limit who can connect to the +Socks ports. 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. +(Default: 2 minutes.) +.LP +.TP \fBTrackHostExits \fR\fIhost\fR,\fI.domain\fR,\fI...\fR\fP For each value in the comma separated list, Tor will track recent connections to hosts that match this value and attempt to |