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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.0' into release-0.4.0

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