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

[nickm at torproject.org]

commit 50626479183858d25d4e52b80b000dbb43097917
Merge: 508002a4c be84ed1a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 10:08:14 2019 -0500

    Merge branch 'maint-0.3.3' into maint-0.3.4

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