commit b478f8e4057191b709b63e51e579230b212439f5 Merge: 1725699e0 be84ed1a6 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 21 10:08:14 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

changes/ticket29168 | 5 +++++ src/or/scheduler_kist.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)