commit f10a23d9a4dc9e334512f3f87a134b266b4943b5 Merge: 05bd43f42 4a8a1f76e Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 21 10:08:14 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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