]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'mr-674-fixup' into main+mr-674-fixup
authorMike Perry <mikeperry-git@torproject.org>
Tue, 10 Jan 2023 16:18:41 +0000 (16:18 +0000)
committerMike Perry <mikeperry-git@torproject.org>
Tue, 10 Jan 2023 16:18:41 +0000 (16:18 +0000)
1  2 
src/core/or/congestion_control_st.h
src/core/or/congestion_control_vegas.c

Simple merge