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

[nickm at torproject.org]

commit 68ec14dc180a46a6d148235a75fc93e7c8fe9657
Merge: cd084c203 d68abbe35
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 09:45:17 2017 -0500

    Merge branch 'maint-0.3.2' into release-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(-)