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

[nickm at torproject.org]

commit 45b9b2245fc141df26cfda62b93e2acfac1b50e9
Merge: c2c0f83c2 4b41ffa64
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 7 08:42:56 2017 -0500

    Merge branch 'maint-0.3.2'

 changes/bug18859    | 7 +++++++
 src/or/circuituse.c | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)