[tor-commits] [tor/maint-0.3.2] Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2

commit 3aab8307a57c668c24dae17b94f780b3f6783c67 Merge: 8687d9cf4 a2bc979d9 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 2 10:19:29 2017 -0400

Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2

changes/bug23820 | 5 ++++ src/or/hs_circuit.c | 66 ++++++++++++++++++++++++++++++++++----------- src/or/hs_client.c | 27 ++++++++++++++++--- src/or/hs_common.c | 78 ++++++++++++++++++++--------------------------------- src/or/hs_config.c | 16 ++++++++--- src/or/hs_service.c | 50 ++++++++++++++++++++-------------- src/test/include.am | 4 ++- 7 files changed, 153 insertions(+), 93 deletions(-)