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

[nickm at torproject.org]

commit ab1f82ea2a3ef9f9bc920885e40e7b477b3dfb93
Merge: ab1f39322 df12ff3de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 23 14:03:30 2019 -0400

    Merge branch 'ticket24963_042_02'

 changes/ticket24963            |  5 +++++
 src/feature/hs/hs_intropoint.c |  9 +++++++++
 src/test/test_hs_intropoint.c  | 13 ++++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)