[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[nickm at torproject.org]

commit fdcd2f2f8666a78398cc23ab57fa542f3b00ce19
Merge: eb0600c6b 00a93b19c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 10:08:14 2019 -0500

    Merge branch 'maint-0.4.0' into release-0.4.0

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