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

[nickm at torproject.org]

commit bb091da1e7e229d6b938ae99d40078610b13ac76
Merge: 372df7a63 976c62e62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 18:59:05 2018 -0500

    Merge branch 'ticket28839_v2_squashed'

 changes/ticket28839                    |  3 +++
 src/feature/dirparse/microdesc_parse.c |  4 ++--
 src/feature/dirparse/parsecommon.c     | 29 +++++++++++++-----------
 src/feature/dirparse/routerparse.c     |  4 ++--
 src/lib/encoding/binascii.c            | 12 ++++++++++
 src/lib/encoding/binascii.h            |  1 +
 src/test/bench.c                       | 40 ++++++++++++++++++++++++++++++++++
 src/test/test_parsecommon.c            |  8 +++----
 src/test/test_util_format.c            |  4 +++-
 9 files changed, 83 insertions(+), 22 deletions(-)