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

[nickm at torproject.org]

commit b1267114cf5bf311a48f06b7eefb4c12c6b872d2
Merge: 7e9676782 f02c6bcad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 17 10:50:58 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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