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

[nickm at torproject.org]

commit 56e8d84ea3e5110c676c165882570b5cc37e946d
Merge: 58b87a2c5 984a28f3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 7 10:21:40 2019 -0400

    Merge branch 'ticket31548_035_01_squashed'

 changes/ticket31548         | 7 +++++++
 src/feature/hs/hs_service.c | 9 +++++++++
 2 files changed, 16 insertions(+)