commit 35558c39dd162902a0e007b6e9dbd66d979043fd Merge: c9906cc3f 8b2e72106 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 16 08:57:56 2018 -0500

Merge remote-tracking branch 'dgoulet/ticket27471_035_02' into maint-0.3.5

changes/ticket27471 | 5 ++ src/core/or/circuitlist.c | 49 +++++++++++++++----- src/core/or/circuitlist.h | 3 +- src/feature/hs/hs_cache.c | 7 +++ src/feature/hs/hs_client.c | 32 +++++++++++++ src/feature/hs/hs_client.h | 1 + src/feature/rend/rendservice.c | 2 +- src/test/test_hs_client.c | 103 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 188 insertions(+), 14 deletions(-)