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

[nickm at torproject.org]

commit 3be1e26b8d27b9baa89549fff56fadd2894ec00f
Merge: 60c46c6cd 412bcc5b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 10 11:31:44 2019 -0400

    Merge branch 'maint-0.4.0'

 changes/bug30040   | 9 +++++++++
 src/ext/getdelim.c | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)