commit dbd4b2be5db6a1964cf6212553d2108fcca73045 Merge: 080bcfa23 5bee5fbac Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 30 11:07:44 2017 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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