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

commit 122eab78d988728f2c71b4fdcc98e996409ff4b2 Merge: cce936aee 88b317ef2 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 22 09:54:41 2017 -0400 Merge remote-tracking branch 'pastly/bug23552_032_03' changes/bug23552 | 3 + src/or/scheduler.c | 158 ++++++++++++++++++++++++++++----------------- src/or/scheduler.h | 25 ++++--- src/or/scheduler_kist.c | 3 + src/or/scheduler_vanilla.c | 1 + 5 files changed, 119 insertions(+), 71 deletions(-)