summaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-01-05 16:41:34 -0500
committerNick Mathewson <nickm@torproject.org>2018-01-05 16:41:34 -0500
commit48d94e290dec5a5563d8ba97754b98f4374e9566 (patch)
tree81477a3ea8f086968d1bdc3fe2f54f904f1bb083 /doc/tor.1.txt
parentc1d98c75e305eaf63e81903ca5a4eb68dcae515b (diff)
parent16fd975a82e502418578c81f04894272c4f11826 (diff)
downloadtor-48d94e290dec5a5563d8ba97754b98f4374e9566.tar.gz
tor-48d94e290dec5a5563d8ba97754b98f4374e9566.zip
Merge branch 'maint-0.3.0' into maint-0.3.1
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index e17c111919..c4c569836b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -450,7 +450,8 @@ GENERAL OPTIONS
When configured to use both directory authorities and fallback
directories, the directory authorities also work as fallbacks. They are
chosen with their regular weights, multiplied by this number, which
- should be 1.0 or less. (Default: 1.0)
+ should be 1.0 or less. The default is less than 1, to reduce load on
+ authorities. (Default: 0.1)
[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ +