commit 109063185be9b42e343d0ef7d085494c60fa05d2 Merge: 4e71fc92c8 3cb9a9b8ce Author: Alexander Færøy ahf@torproject.org Date: Wed Jul 29 13:34:24 2020 +0000

Merge branch 'tor-gitlab/mr/73_squashed'

changes/bug33097 | 4 +++ src/core/mainloop/connection.c | 57 ++++++++++++------------------------------ src/core/mainloop/mainloop.c | 18 ++++++------- src/core/or/circuitlist.c | 1 - src/core/or/connection_st.h | 2 -- src/core/or/sendme.c | 2 +- src/lib/buf/buffers.c | 13 +++++++--- src/lib/buf/buffers.h | 2 +- src/lib/net/buffers_net.c | 33 +++++++++--------------- src/lib/net/buffers_net.h | 6 ++--- src/lib/process/process_unix.c | 2 +- src/lib/tls/buffers_tls.c | 24 ++++++------------ src/lib/tls/buffers_tls.h | 2 +- src/test/test_relaycell.c | 22 ---------------- 14 files changed, 61 insertions(+), 127 deletions(-)