commit 9be65c440baae43dd38ffef216f6198c714ba5ba Merge: 955cf9620 2cdc6b200 Author: teor teor@torproject.org Date: Mon Aug 12 09:41:14 2019 +1000

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

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