commit 1873d4c14c62e8c737e24a60b0aca5a3fcd89eb4 Merge: 1a10948260 7005046bd2 Author: David Goulet dgoulet@torproject.org Date: Mon Oct 4 10:49:27 2021 -0400

Merge branch 'tor-gitlab/mr/444'

changes/ticket40450 | 3 + src/app/main/main.c | 4 + src/core/mainloop/connection.c | 66 ++- src/core/mainloop/mainloop.c | 7 + src/core/or/channeltls.c | 3 +- src/core/or/circuitlist.c | 17 +- src/core/or/circuitmux_ewma.c | 26 +- src/core/or/congestion_control_common.c | 193 +++++++-- src/core/or/congestion_control_common.h | 58 +++ src/core/or/congestion_control_flow.c | 710 ++++++++++++++++++++++++++++++++ src/core/or/congestion_control_flow.h | 48 +++ src/core/or/connection_edge.c | 51 ++- src/core/or/connection_or.c | 7 +- src/core/or/edge_connection_st.h | 55 +++ src/core/or/half_edge_st.h | 12 + src/core/or/include.am | 5 + src/core/or/lttng_cc.inc | 166 ++++++++ src/core/or/or.h | 15 +- src/core/or/relay.c | 62 ++- src/core/or/sendme.c | 28 +- src/core/or/sendme.h | 2 +- src/core/or/trace_probes_cc.c | 33 ++ src/core/or/trace_probes_cc.h | 22 + src/feature/nodelist/networkstatus.c | 4 + src/test/test_channeltls.c | 3 +- src/trunnel/flow_control_cells.c | 382 +++++++++++++++++ src/trunnel/flow_control_cells.h | 120 ++++++ src/trunnel/flow_control_cells.trunnel | 20 + src/trunnel/include.am | 3 + 29 files changed, 2016 insertions(+), 109 deletions(-)