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

dgoulet pushed a commit to branch main in repository tor.

The following commit(s) were added to refs/heads/main by this push: new 482cde5931 Do not reset our RTT in slow start. new 5d6e0b8e13 Merge branch 'maint-0.4.7' 482cde5931 is described below

commit 482cde5931b537d49dc2535bf7a7771d740f441a Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Tue Jan 10 20:47:11 2023 +0000

Do not reset our RTT in slow start.

If a circuit only sends a tiny amount of data such that its cwnd is not full, it won't increase its cwnd above the minimum. Since slow start circuits should never hit the minimum otherwise, we can just ignore them for RTT reset to handle this. --- src/core/or/congestion_control_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/or/congestion_control_common.c b/src/core/or/congestion_control_common.c index e96d22cbfa..f5b7740bed 100644 --- a/src/core/or/congestion_control_common.c +++ b/src/core/or/congestion_control_common.c @@ -902,7 +902,7 @@ congestion_control_update_circuit_rtt(congestion_control_t *cc, if (cc->min_rtt_usec == 0) { // If we do not have a min_rtt yet, use current ewma cc->min_rtt_usec = cc->ewma_rtt_usec; - } else if (cc->cwnd == cc->cwnd_min) { + } else if (cc->cwnd == cc->cwnd_min && !cc->in_slow_start) { // Raise min rtt if cwnd hit cwnd_min. This gets us out of a wedge state // if we hit cwnd_min due to an abnormally low rtt. uint64_t new_rtt = percent_max_mix(cc->ewma_rtt_usec, cc->min_rtt_usec,