summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-13 16:55:06 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-13 16:55:06 -0400
commit66a564fad8a99a21bd6cda6a70982858376b78e9 (patch)
tree54d124cdfe5e6e3b92b22e61c3dde02440888361 /doc
parentec29cae8d7e97d652a87d753d93e4289e5a0ed26 (diff)
parent66258f8878abe6323c56bcf0b20796e1c43d66fc (diff)
downloadtor-66a564fad8a99a21bd6cda6a70982858376b78e9.tar.gz
tor-66a564fad8a99a21bd6cda6a70982858376b78e9.zip
Merge branch 'maint-0.3.1'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f0b7fa8e46..fdb7168673 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2073,6 +2073,16 @@ details.)
because clients connect via the ORPort by default. Setting either DirPort
or BridgeRelay and setting DirCache to 0 is not supported. (Default: 1)
+[[MaxConsensusAgeForDiffs]] **MaxConsensusAgeForDiffs** __N__ **minutes**|**hours**|**days**|**weeks**::
+ When this option is nonzero, Tor caches will not try to generate
+ consensus diffs for any consensus older than this amount of time.
+ If this option is set to zero, Tor will pick a reasonable default from
+ the current networkstatus document. You should not set this
+ option unless your cache is severely low on disk space or CPU.
+ If you need to set it, keeping it above 3 or 4 hours will help clients
+ much more than setting it to zero.
+ (Default: 0)
+
DIRECTORY AUTHORITY SERVER OPTIONS
----------------------------------