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
commit3618bd6166002c7aadbb832d8a3e8bdba193f00c (patch)
treef0693f553c29a154292829c9d4a6a2fc0ec23938 /doc/tor.1.txt
parent9ef97a268b06fed7b07908823600911a2a6eadc1 (diff)
parent48d94e290dec5a5563d8ba97754b98f4374e9566 (diff)
downloadtor-3618bd6166002c7aadbb832d8a3e8bdba193f00c.tar.gz
tor-3618bd6166002c7aadbb832d8a3e8bdba193f00c.zip
Merge branch 'maint-0.3.1' into maint-0.3.2
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 fc285ebe1b..a319aa9381 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -466,7 +466,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**] __ipv4address__:__port__ __fingerprint__ +