[tor-commits] [tor] 09/09: 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 c9232e8f3f3d8152277f6a3188fce9ce57da666a Merge: a88ed7a670 0564a19f6a Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Aug 11 09:27:03 2022 -0400

Merge branch 'maint-0.4.7'

changes/bug40642 | 9 + src/core/or/congestion_control_common.c | 67 ++++++- src/core/or/congestion_control_common.h | 23 +++ src/core/or/congestion_control_st.h | 14 ++ src/core/or/congestion_control_vegas.c | 311 ++++++++++++++++++-------------- 5 files changed, 288 insertions(+), 136 deletions(-)