and put ShutdownWaitLength in man page

svn:r3754

diff --git a/doc/TODO b/doc/TODO
index 07288ff93c975eb3fb649d633b9e5f1a3cbaa675..d2f9d09d1d0b627cea6c869e706db549516523a2 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -82,7 +82,7 @@ R     - revised circ selection stuff.
       - If we never get a CONNECTED back, we should put the stream back in
         CONTROLLER_WAIT, not in CIRCUIT_WAIT.
     - Tests for new controller features
-R . HTTPS proxy for OR CONNECT stuff. (For outgoing SSL connections to
+R o HTTPS proxy for OR CONNECT stuff. (For outgoing SSL connections to
     other ORs.)
   o Changes for forward compatibility
     o If a version is later than the last in its series, but a version

diff --git a/doc/tor.1.in b/doc/tor.1.in
index dfadfd6892a62655e606870445290e37b9055eaa..b81e89731b81b41b09297bd56a14806b9bfbface 100644 (file)
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -310,6 +310,12 @@ redirection is to be performed on a given set of addresses by using the
 special target string "pass", which prevents subsequent rules from being
 considered.
 .TP
+\fBShutdownWaitLength\fR\fINUM\fP
+When we get a SIGINT and we're a server, we begin shutting down: we close
+listeners and start refusing new circuits. After \fBNUM\fP seconds,
+we exit. If we get a second SIGINT, we exit immediately.  (Default:
+30 seconds)
+.TP
 \fBDirPostPeriod \fR\fIN\fR \fBseconds\fR|\fBminutes\fR|\fBhours\fR|\fBdays\fR|\fBweeks\fP
 Every time the specified period elapses, Tor uploads its server
 descriptors to the directory servers.  This information is also