commit a1d9f44971f2442a41a4d5fbed5aba28d872e15b Merge: c28cdcc9b 454bdb22e Author: teor teor@torproject.org Date: Wed Apr 10 18:27:11 2019 +1000

Merge branch 'maint-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(-)