commit c3fca4e4b324aae9be7ebe2077eb50dcbe5f1ac4 Merge: f70929347 4df31adef Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 19 11:51:24 2019 -0500 Merge branch 'maint-0.4.0' changes/bug29508 | 3 +++ src/core/or/scheduler_kist.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)