commit 5bee5fbac71f3534b8e1a19c742c2a61f686ca9d Merge: d5eea977b 8652f3e9e Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 30 11:07:26 2017 -0400

Merge remote-tracking branch 'public/bug23774_032' into maint-0.3.2

changes/bug23774 | 4 ++++ src/or/scheduler_kist.c | 1 + 2 files changed, 5 insertions(+)