[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit 3618bd6166002c7aadbb832d8a3e8bdba193f00c
Merge: 9ef97a268 48d94e290
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 5 16:41:34 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket24681 | 6 ++++++
 doc/tor.1.txt       | 3 ++-
 src/or/config.c     | 9 ++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --cc doc/tor.1.txt
index fc285ebe1,c4c569836..a319aa938
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -466,11 -450,12 +466,12 @@@ GENERAL OPTION
      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__ +
 +[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] __ipv4address__:__port__ __fingerprint__ +
  
 -[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] [**flags**] __address__:__port__ __ fingerprint__::
 +[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] [**flags**] __ipv4address__:__port__ __ fingerprint__::
      These options behave as DirAuthority, but they replace fewer of the
      default directory authorities. Using
      AlternateDirAuthority replaces the default Tor directory authorities, but