[tor-commits] [tor/master] Merge branch 'maint-0.4.0'

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.0'

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