commit e9b3b5c3fcaff1914c14dd67f0fdb95e0cb42fee Merge: aa26fd308 454bdb22e Author: teor teor@torproject.org Date: Wed Apr 10 18:27:07 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

changes/bug30041 | 5 +++++ src/core/mainloop/connection.c | 4 ++++ src/lib/buf/buffers.c | 11 +++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-)