[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2

[nickm at torproject.org]

commit de3cf40fa658d62a61bb620c9dba8e90105da339
Merge: e2aacf100 f870f9c8b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 16:30:44 2018 -0500

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

 changes/bug24895     |  8 ++++++++
 src/or/hs_circuit.c  |  7 ++++++-
 src/or/hs_common.c   | 17 +++++++++++++++++
 src/or/hs_common.h   |  2 ++
 src/or/rendservice.c |  4 ++--
 5 files changed, 35 insertions(+), 3 deletions(-)