[tor-commits] [tor] 04/05: Merge branch 'tor-gitlab/mr/654' into maint-0.4.7

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit 4db03ac360213901d45beb8d54918f1a6417ccba Merge: fe045f02d0 04fafeb2dd Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Nov 9 11:51:46 2022 -0500

Merge branch 'tor-gitlab/mr/654' into maint-0.4.7

src/core/or/circuitlist.c | 12 ++----- src/core/or/congestion_control_flow.c | 10 ++---- src/core/or/congestion_control_vegas.c | 37 ++++++++++++++------ src/core/or/congestion_control_vegas.h | 2 ++ src/feature/relay/relay_metrics.c | 64 ++++++++++++++++++++++------------ src/lib/math/stats.h | 30 +++++++++++++--- 6 files changed, 99 insertions(+), 56 deletions(-)