[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1399'

[nickm at torproject.org]

commit ab064cf762f0049913ae346dc9b500bc9580395a
Merge: 755f00160 081bd3731
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 9 16:37:47 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1399'

 changes/bug31995           | 3 +++
 src/test/test_hs_service.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)