commit 4dd4dbf046693be581dd05cdae1c62e68472d18e Merge: 7f9eaec53 64a934ff0 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 24 08:15:53 2020 -0400

Merge remote-tracking branch 'onionk/inbufoverflow1-043' into ticket33131_044

changes/bug33131 | 3 +++ src/core/mainloop/connection.c | 6 ++++++ src/lib/buf/buffers.c | 30 +++++++++++++++--------------- src/lib/buf/buffers.h | 3 +++ src/lib/net/buffers_net.c | 12 ++++++------ src/lib/tls/buffers_tls.c | 8 ++++---- 6 files changed, 37 insertions(+), 25 deletions(-)