[tor-commits] [tor] 05/05: Merge branch '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 bd055a258a71e7683e205b5f9df299053b137d32 Merge: 1ff78f3751 4db03ac360 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Nov 9 11:51:52 2022 -0500

Merge branch '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(-)