[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera/bug24861'

commit edc87b263f09d09eb96599fde27cd82d7ea5aa13 Merge: 1f65a2310 06368e531 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 12 13:29:53 2018 -0500 Merge remote-tracking branch 'ffmancera/bug24861' changes/ticket24861 | 5 +++++ src/common/torint.h | 10 ++++++++++ src/or/circuitlist.c | 11 +++++++---- 3 files changed, 22 insertions(+), 4 deletions(-)