commit 6390a0c3b64ce633026a7990a8932dafbb89614e Merge: 18e59fd ae1d4cf Author: Nick Mathewson nickm@torproject.org Date: Thu May 11 08:33:32 2017 -0400

Merge branch 'ticket21871_031_03_squashed'

src/or/hs_descriptor.c | 317 +++++++++++++++++++++++------------------- src/or/hs_descriptor.h | 41 +++--- src/or/parsecommon.h | 4 +- src/test/hs_test_helpers.c | 257 ++++++++++++++++++++++++++++++++++ src/test/hs_test_helpers.h | 22 +++ src/test/include.am | 1 + src/test/test_hs_cache.c | 103 ++------------ src/test/test_hs_descriptor.c | 303 ++-------------------------------------- 8 files changed, 496 insertions(+), 552 deletions(-)