commit 943134e886d9cef2be6efa861578f45f1ef2542e Merge: b56ce79e6 d4c7bd98a Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 3 11:56:35 2018 -0500

Merge remote-tracking branch 'pastly2/ticket24531_033_01'

changes/ticket24531 | 3 ++ src/or/scheduler.c | 72 +++++++++++++++++++++++++--------------------- src/or/scheduler.h | 3 ++ src/or/scheduler_kist.c | 24 ++++++---------- src/or/scheduler_vanilla.c | 32 ++++----------------- 5 files changed, 61 insertions(+), 73 deletions(-)