[tor-commits] [tor] 01/01: 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 c1d8db8ba57a9ed1419e121c4275b57101403ff6 Merge: 80748f41af c50496036b Author: David Goulet dgoulet@torproject.org AuthorDate: Tue Jan 10 11:57:11 2023 -0500

Merge branch 'maint-0.4.7' into release-0.4.7

changes/bug40732 | 7 ++ src/core/or/congestion_control_nola.c | 4 +- src/core/or/congestion_control_st.h | 11 +- src/core/or/congestion_control_vegas.c | 162 ++++++++++++++++++++++++++---- src/core/or/congestion_control_westwood.c | 4 +- 5 files changed, 160 insertions(+), 28 deletions(-)