commit df4d5ebb7dfaac49915d7ef775fcbf242e6c688b Merge: fa6137a90 129456e22 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 19 16:30:53 2018 -0500

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