commit 7c5d7dbe8c60ce5b9356f3f590815b48f6001719 Merge: 346f117b8 35558c39d Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 16 08:58:25 2018 -0500 Merge branch 'maint-0.3.5' into release-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(-)