[tor-commits] [tor/master] Merge remote-tracking branch 'pastly/issue26703'

commit 5aaea38d889ae558ea0e9b01b4c5b58f3935b542 Merge: 8505522e5 d20feddfc Author: David Goulet <dgoulet@torproject.org> Date: Mon Jul 16 14:44:45 2018 -0400 Merge remote-tracking branch 'pastly/issue26703' changes/ticket26703 | 3 +++ src/core/or/scheduler.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)