diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-01-10 15:58:28 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-01-10 15:58:28 -0500 |
| commit | edf4887e643b444bb70eece1719dfe29e8158080 (patch) | |
| tree | b591f7d46b88e154d131c59cdbb594bb434e578e | |
| parent | c1d8db8ba57a9ed1419e121c4275b57101403ff6 (diff) | |
| parent | 482cde5931b537d49dc2535bf7a7771d740f441a (diff) | |
| download | tor-edf4887e643b444bb70eece1719dfe29e8158080.tar.gz tor-edf4887e643b444bb70eece1719dfe29e8158080.zip | |
Merge branch 'maint-0.4.7' into release-0.4.7
| -rw-r--r-- | src/core/or/congestion_control_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |