[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 04812e59dfed3c6ea4ad376595dbc8e36aaf12d2
Merge: 2e590bac9 e0f7a2dbd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 20 08:39:39 2017 -0500

    Merge branch 'maint-0.3.2'

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