commit fde18fed60929a73dae8349222b2d7c3cd02a22b Merge: 63af663b8 0ac2afad0 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 14 09:13:28 2017 -0400

Merge branch 'bug23019_squashed'

src/or/hs_common.c | 15 ++++++++++++--- src/test/hs_build_address.py | 5 +++-- src/test/test_entryconn.c | 4 ++-- src/test/test_hs_common.c | 28 ++++++++++++++++++---------- 4 files changed, 35 insertions(+), 17 deletions(-)