commit 86aa7f0a3f26a02e240e64f844b8072dbe424379 Merge: 60dfdd9b1 f02c6bcad Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 17 10:50:58 2018 -0500

Merge branch 'maint-0.3.2'

changes/bug24894 | 5 +++++ src/or/hs_circuit.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)