[tor-commits] [tor/master] Merge branch 'arthuredelstein_18859+1_031' into maint-0.3.2

[nickm at torproject.org]

commit 4b41ffa64d251268602b06552a53da8cbd60af5c
Merge: d4ca18573 13049a986
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 7 08:42:49 2017 -0500

    Merge branch 'arthuredelstein_18859+1_031' into maint-0.3.2

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