commit 88642bbdc783d8616ba779dbd33378e2c4e09501 Merge: 2a7cad957 c38157be9 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 21 10:27:39 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)