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

[nickm at torproject.org]

commit a46dcc0709d29393a2cd1a0a547bf641f4a79aa6
Merge: a321f8f4a 6a9a118f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 2 10:22:35 2017 -0400

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