[tor-commits] [tor] 03/03: Merge branch 'maint-0.4.7' into release-0.4.7

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

dgoulet pushed a commit to branch release-0.4.7 in repository tor.

commit 9dd62fb04be8304a75745012a5bae8d6b8cd7619 Merge: 09f59ae7af 00633bc619 Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Nov 8 12:47:17 2022 -0500

Merge branch 'maint-0.4.7' into release-0.4.7

src/core/or/congestion_control_vegas.c | 28 ++++++++++++++++++++++++++++ src/core/or/congestion_control_vegas.h | 2 ++ src/feature/relay/relay_metrics.c | 18 ++++++++++++++++++ 3 files changed, 48 insertions(+)