[tor-commits] [tor/master] Merge branch 'ticket4631_squashed'

[nickm at torproject.org]

commit b9cc4cc50a843273f31b0ea49fcc03d638a3424c
Merge: 98bf7604a bed3b292a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 20 08:17:47 2020 -0500

    Merge branch 'ticket4631_squashed'

 changes/bug4631                   |   6 ++
 src/feature/dirauth/dirvote.c     |  75 +++++++++-----
 src/feature/dirauth/dirvote.h     |   7 +-
 src/feature/dircache/dircache.c   |   2 +-
 src/feature/dirclient/dirclient.c |   2 +-
 src/test/test_dir_handle_get.c    | 203 ++++++++++++++++++++++++++++++++++++--
 6 files changed, 264 insertions(+), 31 deletions(-)