[tor-commits] [tor] 07/15: Merge branch 'mr-674-fixup' into main+mr-674-fixup

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

dgoulet pushed a commit to branch main in repository tor.

commit 8c017e9cffa9304aada14f2decf75c7971919f08 Merge: 7e055c383c fd86420d96 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Tue Jan 10 16:18:41 2023 +0000

Merge branch 'mr-674-fixup' into main+mr-674-fixup

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(-)