commit 77634795b0258f04a31a51d827d45eab40557f65 Merge: 31542cc30 cb5654f30 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 1 16:57:57 2018 -0500

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

changes/bug24700 | 4 ++++ src/or/channel.c | 3 +++ src/or/scheduler.c | 20 ++++++++++++-------- src/or/scheduler_kist.c | 14 ++++++++++---- 4 files changed, 29 insertions(+), 12 deletions(-)