commit 61cb2993ddb39d72bb312c6904414151d71e0577 Merge: 56857291b fbc455cbd Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 1 08:10:34 2018 -0500

Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2

changes/bug24975 | 2 +- src/or/networkstatus.c | 36 +++++++++++++++++++++--------------- src/or/scheduler.c | 5 ++--- src/or/scheduler.h | 8 +++----- src/or/scheduler_kist.c | 20 ++++++++------------ src/test/test_scheduler.c | 16 ++++++++-------- 6 files changed, 43 insertions(+), 44 deletions(-)