commit dddae36f5e0e9e088cd9aa98c6e4a6c904e1efa4 Merge: 9ae18b8a9 070064de8 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 29 17:46:50 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket23696_032_01'

changes/bug23696 | 3 +++ src/or/scheduler_kist.c | 10 ++++++++++ 2 files changed, 13 insertions(+)