[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

commit 98682f689be39c833c8718d5983c3e8882b54228 Merge: 58e809481 d68abbe35 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 09:45:17 2017 -0500

Merge branch '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(-)