[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1868/head'

commit cbe9e56590b0ea354313667bf20e187dd5b1d556 Merge: 3253c357e 4dd4dbf04 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 29 08:32:44 2020 -0400

Merge remote-tracking branch 'tor-github/pr/1868/head'

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(-)