commit 62401812c71856c6884c32a57d1edd16576643f1 Merge: 0a41d17c1 8b2e72106 Author: Nick Mathewson <ni...@torproject.org> Date: Thu Oct 18 13:01:41 2018 -0400
Merge remote-tracking branch 'dgoulet/ticket27471_035_02' 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(-) _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits