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

[nickm at torproject.org]

commit 3e24bd5557e2769195f6ef0100e131cda9df0943
Merge: 2f1f3b170 d4a74021e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 20 07:56:42 2020 -0400

    Merge branch 'maint-0.4.3'

 changes/bug33668                     |  4 ++++
 changes/bug33674                     |  4 ++++
 src/feature/dirauth/dirauth_config.h | 10 ++++++++--
 src/feature/dirauth/dirvote.c        | 24 ++++++++++++++++++++----
 src/feature/dirauth/dirvote.h        |  2 +-
 src/feature/dirauth/process_descs.c  |  8 +++++---
 src/feature/dirauth/process_descs.h  | 11 ++++++-----
 src/feature/relay/relay_config.c     |  7 ++++---
 src/feature/relay/relay_config.h     | 17 ++++++++++++++---
 9 files changed, 66 insertions(+), 21 deletions(-)