[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.4' into release-0.4.4

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