[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

[nickm at torproject.org]

commit c90535c539c60b031a3235d7e26b802865ef14c4
Merge: 07f2a06c61 c1bcc1da03
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 26 16:39:31 2020 -0400

    Merge branch 'maint-0.4.4'

 changes/ticket40164                     | 6 ++++++
 doc/man/tor.1.txt                       | 3 ++-
 src/feature/dirauth/dirauth_options.inc | 2 +-
 src/feature/dirauth/dirvote.c           | 7 +++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --cc src/feature/dirauth/dirauth_options.inc
index 40ef7c3bab,2aa07a6c88..40a42b9092
--- a/src/feature/dirauth/dirauth_options.inc
+++ b/src/feature/dirauth/dirauth_options.inc
@@@ -44,16 -44,9 +44,16 @@@ CONF_VAR(AuthDirSharedRandomness, BOOL
  /* NOTE: remove this option someday. */
  CONF_VAR(AuthDirTestEd25519LinkKeys, BOOL, 0, "1")
  
 +/**
 + * Bool (default 1): As an authority, should we launch tests for
 + * reachability, and use those results to vote on "Running"?  If 0,
 + * we assume that every relay is Runnning.
 + **/
 +CONF_VAR(AuthDirTestReachability, BOOL, 0, "1")
 +
  /** Authority only: key=value pairs that we add to our networkstatus
   * consensus vote on the 'params' line. */
- CONF_VAR(ConsensusParams, STRING, 0, NULL)
+ CONF_VAR(ConsensusParams, LINELIST, 0, NULL)
  
  /** Authority only: minimum number of measured bandwidths we must see
   * before we only believe measured bandwidths to assign flags. */