[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/94'

[nickm at torproject.org]

commit d1fda62d11139830b0d81d56d0dfd372237d0be6
Merge: 3e3b0b0443 32b33c0d21
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 3 08:54:03 2020 -0400

    Merge remote-tracking branch 'tor-gitlab/mr/94'

 changes/bug27194                    |  3 +++
 src/core/or/protover.c              |  3 ++-
 src/feature/dirparse/ns_parse.c     | 41 +++++++++++++++++++++++++++++--------
 src/rust/protover/protover.rs       | 17 +++++++++------
 src/rust/protover/tests/protover.rs | 13 ------------
 src/test/test_protover.c            |  4 ++++
 6 files changed, 53 insertions(+), 28 deletions(-)