commit d68abbe358af41b18c9c54444e49689e2626328d Merge: 4b41ffa64 68601a85c Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 09:42:12 2017 -0500

Merge remote-tracking branch 'dgoulet/bug23603_032_02' into maint-0.3.2

changes/bug23603 | 7 ++++ src/or/circuitlist.c | 30 ++++++++-------- src/or/circuitlist.h | 2 +- src/or/hs_circuit.c | 28 +++++++++++++++ src/or/hs_circuit.h | 3 ++ src/or/hs_common.c | 1 + src/or/hs_common.h | 2 ++ src/or/hs_service.c | 15 ++++---- src/test/test_hs_service.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 151 insertions(+), 25 deletions(-)