Browse Source

MaxConn has been obsolete for a while now.
Document ConnLimit, which is the opposite.


svn:r5933

Roger Dingledine 19 years ago
parent
commit
51dffee36c
1 changed files with 11 additions and 5 deletions
  1. 11 5
      doc/tor.1.in

+ 11 - 5
doc/tor.1.in

@@ -49,6 +49,17 @@ advertised bandwidth rate) can thus reduce the CPU demands on their
 server without impacting network performance.
 server without impacting network performance.
 .LP
 .LP
 .TP
 .TP
+\fBConnLimit \fR\fINUM\fP
+The minimum number of file descriptors that must be available to
+the Tor process before it will start. Tor will ask the OS for as
+many file descriptors as the OS will allow (you can find this
+by "ulimit -H -n"). If this number is less than ConnLimit, then
+Tor will refuse to start.
+
+You probably don't need to adjust this. It has no effect on
+Windows since that platform lacks getrlimit(). (Default: 1024)
+.LP
+.TP
 \fBControlPort \fR\fIPort\fP
 \fBControlPort \fR\fIPort\fP
 If set, Tor will accept connections from the same machine (localhost only) on
 If set, Tor will accept connections from the same machine (localhost only) on
 this port, and allow those connections to control the Tor process using the
 this port, and allow those connections to control the Tor process using the
@@ -153,11 +164,6 @@ option may appear more than once in a configuration file.  Messages
 are sent to all the logs that match their severity level.
 are sent to all the logs that match their severity level.
 .LP
 .LP
 .TP
 .TP
-\fBMaxConn \fR\fINUM\fP
-Maximum number of simultaneous sockets allowed.  You probably don't need
-to adjust this. (Default: 1024)
-.LP
-.TP
 \fBOutboundBindAddress \fR\fIIP\fP
 \fBOutboundBindAddress \fR\fIIP\fP
 Make all outbound connections originate from the IP address specified.  This
 Make all outbound connections originate from the IP address specified.  This
 is only useful when you have multiple network interfaces, and you want all
 is only useful when you have multiple network interfaces, and you want all