[tor-commits] [tor/master] Merge branch 'tor-github/pr/1953'

[dgoulet at torproject.org]

commit b039d3e803f13ea7d4ccd623b43c57fc756f0aab
Merge: 7f999203c a7aa97298
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Jul 1 09:47:26 2020 -0400

    Merge branch 'tor-github/pr/1953'

 changes/ticket34445                     |  5 +++++
 doc/tor.1.txt                           | 10 +++++++---
 src/feature/dirauth/dirauth_options.inc |  7 +++++++
 src/feature/dirauth/reachability.c      |  5 +++++
 src/feature/dirauth/voteflags.c         |  6 +++---
 5 files changed, 27 insertions(+), 6 deletions(-)