summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/TODO4
-rw-r--r--doc/tor.1.in6
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/TODO b/doc/TODO
index eb0df7830c..b985bf9740 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -15,10 +15,10 @@ N&R- bring tor-spec up to date
o cache and serve running-routers on other nodes?
o cache running-routers
o download running-routers from servers running rc5-cvs or later
-N - pump up periods for fetching things; figure out how to do this
+ o pump up periods for fetching things; figure out how to do this
backward-compatibily, so that people who did set dirfetchpostperiod
get the right behavior.
- - If dirport is set, we should have a maximum dirfetchperiod and
+ o If dirport is set, we should have a maximum dirfetchperiod and
a maximum statusfetchperiod, or else we'll serve very stale stuff.
o Adapt version parsing code to handle new version scheme; document new
version scheme.
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 05bf835a53..c944b8e155 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -67,7 +67,7 @@ rather than connecting directly to any directory servers.
.TP
\fBKeepalivePeriod \fR\fINUM\fP
To keep firewalls from expiring connections, send a padding keepalive
-cell on open connections every NUM seconds. (Default: 300)
+cell on open connections every NUM seconds. (Default: 5 minutes.)
.TP
\fBMaxConn \fR\fINUM\fP
Maximum number of simultaneous sockets allowed. You probably don't need
@@ -119,7 +119,7 @@ information about the current state of known servers. (Default: 20 minutes.)
\fBRendPostPeriod \fR\fIN\fR \fBseconds\fR|\fBminutes\fR|\fBhours\fR|\fBdays\fR|\fBweeks\fP
Every time the specified period elapses, Tor uploads any rendezvous
service descriptors to the directory servers. This information is also
-uploaded whenever it changes. (Default: 10 minutes.)
+uploaded whenever it changes. (Default: 20 minutes.)
.SH CLIENT OPTIONS
.PP
@@ -282,7 +282,7 @@ considered.
\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
-uploaded whenever it changes. (Default: 10 minutes.)
+uploaded whenever it changes. (Default: 20 minutes.)
.TP
\fBAccountingMax \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
Never send more than the specified number of bytes in a given