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

[nickm at torproject.org]

commit 9096454492c527acb7e72a655c3d5bd3d2ae8d52
Merge: e74229efc e0f7a2dbd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 20 08:39:39 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug23681    |  5 +++++
 src/or/circuituse.c | 18 ++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)