Browse Source

and add SocksTimeout to the man page
and stop shouting when we talk about Socks


svn:r6218

Roger Dingledine 19 years ago
parent
commit
442c054a71
1 changed files with 13 additions and 7 deletions
  1. 13 7
      doc/tor.1.in

+ 13 - 7
doc/tor.1.in

@@ -224,7 +224,7 @@ available. This is untested and probably buggy. (Default: 0)
 
 
 .SH CLIENT OPTIONS
 .SH CLIENT OPTIONS
 .PP
 .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
 .LP
 .TP
 .TP
 \fBAllowInvalidNodes\fR \fBentry\fR|\fBexit\fR|\fBmiddle\fR|\fBintroduction\fR|\fBrendezvous\fR|...\fP
 \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.
 A list of nodes to never use when choosing a rendezvous point.
 .LP
 .LP
 .TP
 .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
 applications.  Set this to 0 if you don't want to allow application
 connections. (Default: 9050)
 connections. (Default: 9050)
 .LP
 .LP
 .TP
 .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
 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
 (e.g. 192.168.0.1:9100). This directive can be specified multiple times
 to bind to multiple addresses/ports.
 to bind to multiple addresses/ports.
 .LP
 .LP
 .TP
 .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.
 The policies have the same form as exit policies below.
 .LP
 .LP
 .TP
 .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
 \fBTrackHostExits \fR\fIhost\fR,\fI.domain\fR,\fI...\fR\fP
 For each value in the comma separated list, Tor will track recent connections
 For each value in the comma separated list, Tor will track recent connections
 to hosts that match this value and attempt to
 to hosts that match this value and attempt to