[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry/bug24769'

[nickm at torproject.org]

commit f6a230ec9555688d61db37eb22c8823619332d83
Merge: 9e566f3a7 b65c67f0e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 14 10:03:14 2018 -0500

    Merge remote-tracking branch 'mikeperry/bug24769'

 changes/bug24769     |  7 +++++++
 src/or/circuitlist.c | 18 ++++++++++++++----
 src/or/circuituse.c  | 19 +++++++++----------
 3 files changed, 30 insertions(+), 14 deletions(-)