[tor-commits] [tor/master] Merge remote-tracking branch 'ahf/ahf/bugs/21266'

[nickm at torproject.org]

commit fc3e742b5b804c9ab12c6bd878551b03dfc24ba9
Merge: 2d2ab29 7eb7af0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 2 08:40:05 2017 -0500

    Merge remote-tracking branch 'ahf/ahf/bugs/21266'

 src/test/test_hs_intropoint.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)