commit eb00eff09defc607f4dc4b6fec7b3c80dc8b439f Merge: 1ef1ed76d e386d61c9 Author: Nick Mathewson nickm@torproject.org Date: Wed May 2 16:03:57 2018 -0400

Merge branch 'ticket25997'

changes/ticket25997 | 5 +++++ src/test/test_hs_common.c | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-)