[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0

[nickm at torproject.org]

commit 4df31adef7ada9221de7e39430a34234dd3fc6cb
Merge: 4bc55ed5e b054a6c6b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 19 11:51:19 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0

 changes/bug29508             | 3 +++
 src/core/or/scheduler_kist.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)