summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-01-05 16:41:35 -0500
committerNick Mathewson <nickm@torproject.org>2018-01-05 16:41:35 -0500
commit0b6fe3c1230a7d135a6a5541b2abb8f6641cc48e (patch)
tree8e21f6a0f3c9c9105b1673cabd8de95184253c51 /doc
parent2d92f4c19a151157b81091d352d59e4f72810542 (diff)
parent3618bd6166002c7aadbb832d8a3e8bdba193f00c (diff)
downloadtor-0b6fe3c1230a7d135a6a5541b2abb8f6641cc48e.tar.gz
tor-0b6fe3c1230a7d135a6a5541b2abb8f6641cc48e.zip
Merge branch 'maint-0.3.2'
Diffstat (limited to 'doc')
-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 64114d6e6b..4922383338 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -479,7 +479,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__ +