commit 412bcc5b2afcc965a6c8e6d09c3bda62df39bcc5 Merge: 454bdb22e 2cdc6b200 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 10 11:31:33 2019 -0400

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

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