[tor-commits] [tor/master] Merge branch 'tor-github/pr/1746'

[dgoulet at torproject.org]

commit f0561861e306e9c9701d7ae35cf6a9158027b222
Merge: 17724a7cd 9a68eca3a
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Feb 18 13:57:03 2020 -0500

    Merge branch 'tor-github/pr/1746'

 changes/ticket33349          |  4 +++
 src/core/or/scheduler.c      | 75 +++++++++++++++++++++++---------------------
 src/core/or/scheduler_kist.c |  7 +++++
 3 files changed, 50 insertions(+), 36 deletions(-)