[tor-commits] [tor/master] Merge branch 'bug23539_032_01_squashed'

[nickm at torproject.org]

commit 90e8d1f58fb77eb15c59c1bd846aabe1555b64f2
Merge: f82f1f4b8 581e2c8b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 25 11:12:56 2017 -0400

    Merge branch 'bug23539_032_01_squashed'

 changes/bug23539          |  4 ++++
 src/or/or.h               |  2 +-
 src/or/scheduler.c        |  9 ++------
 src/or/scheduler.h        |  2 +-
 src/or/scheduler_kist.c   | 53 ++++++++++++++++++++++++-----------------------
 src/test/test_scheduler.c | 14 +++----------
 6 files changed, 38 insertions(+), 46 deletions(-)