commit 03eb2037d11d2014044d9cc90f19d0d35e6045bf Merge: 698334eee 129456e22 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 19 16:30:53 2018 -0500 Merge branch 'maint-0.3.2' into release-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(-)