commit df37b933363cc720a24d1ce5ac70a576480abb25 Merge: a877241e6 61cb2993d Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 1 08:15:18 2018 -0500

Merge branch 'maint-0.3.2' into release-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(-)