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

[nickm at torproject.org]

commit 00a93b19cf0db9c0f47a48d55c658058f976ab93
Merge: df3484b2b 4a8a1f76e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 10:08:14 2019 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.0

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