[tor-commits] [tor/master] Merge remote-tracking branch 'neel/b23094'

commit 4cf6b67f5e83e1a26b4b2fbdb3b169c137a30687 Merge: 07b486c17 bfe5a739b Author: Nick Mathewson nickm@torproject.org Date: Tue May 1 08:56:23 2018 -0400

Merge remote-tracking branch 'neel/b23094'

changes/bug23094 | 4 ++++ src/or/hs_common.c | 27 ++++++++++++--------------- src/or/hs_common.h | 13 ------------- src/or/hs_control.c | 3 +-- src/or/hs_service.c | 4 ++-- src/or/nodelist.c | 16 +++++++--------- src/or/or.h | 17 ++++++++++++++--- src/test/test_hs_control.c | 5 ++--- 8 files changed, 42 insertions(+), 47 deletions(-)