[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/935'

[nickm at torproject.org]

commit 475ac11bc11e258efe916d8e53277c00e5b136b6
Merge: 6559aefc7 2ab19a48c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 23 14:11:04 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/935'

 changes/bug28269              |  7 +++++++
 src/feature/hs/hs_client.c    |  2 +-
 src/feature/hs/hs_common.c    | 23 +++++++++++++++++++----
 src/feature/hs/hs_common.h    |  2 +-
 src/feature/rend/rendclient.c |  9 ++++++---
 src/test/test_hs.c            | 10 ++++++++++
 6 files changed, 44 insertions(+), 9 deletions(-)