commit b5412d12f9eb4ef7ad5265ac441cd63b3f100ef3 Merge: ca8e6451f 8fda94f94 Author: David Goulet dgoulet@torproject.org Date: Wed Apr 1 08:22:36 2020 -0400

Merge branch 'tor-github/pr/1844'

src/feature/hs/hs_circuit.c | 6 +++--- src/feature/hs/hs_ob.c | 8 ++++---- src/feature/hs/hs_service.c | 14 +++++++++++--- src/feature/hs/hs_service.h | 16 ++++++++-------- src/test/test_hs_service.c | 2 +- 5 files changed, 27 insertions(+), 19 deletions(-)