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

[nickm at torproject.org]

commit 0a41d17c1585d262031a8b5885853881adaaf8fb
Merge: e979a56bb 3a8f32067
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 18 10:16:30 2018 -0400

    Merge branch 'ticket27549_035_01_squashed'

 changes/ticket27549            |  3 ++
 src/feature/hs/hs_descriptor.c | 89 +++++++++++++++++++++++++++---------------
 2 files changed, 61 insertions(+), 31 deletions(-)