[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1727/head'

[nickm at torproject.org]

commit a6509cb86744f8f20bd522c744aecf88474a039f
Merge: a010dbf94 ed1ee2001
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 14 08:20:21 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1727/head'

 changes/bug33285              |  3 +++
 src/core/or/protover.c        |  4 ++--
 src/feature/dirauth/dirvote.c | 15 ++++++---------
 src/feature/dirauth/dirvote.h | 30 ++++++++++++++++++++++++++++++
 src/rust/protover/protover.rs |  8 ++++----
 src/test/test_protover.c      | 41 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 86 insertions(+), 15 deletions(-)