aboutsummaryrefslogtreecommitdiff
path: root/doc
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
commit16fd975a82e502418578c81f04894272c4f11826 (patch)
treeda69981d422d50375e7f17e64e4849058a5a234b /doc
parentbbc9ff160e7071b7a2fa9ab200b6496580975b06 (diff)
parentc52d4d9e3454fd0a94cb900dc18516a489441c18 (diff)
downloadtor-16fd975a82e502418578c81f04894272c4f11826.tar.gz
tor-16fd975a82e502418578c81f04894272c4f11826.zip
Merge branch 'maint-0.2.9' into maint-0.3.0
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 1665cfe947..7ef8920858 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -446,7 +446,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__ +