aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2022-07-27 11:33:16 -0400
committerDavid Goulet <dgoulet@torproject.org>2022-07-27 11:33:16 -0400
commit691e542fd520edb8a1371eb42fa7b11b296616b9 (patch)
treeb06453987c73e1f7b61dd7b69b456b72cbc9e265 /src
parentdc13936f20e6263a099f40d32a274847e8384f96 (diff)
parent8e7bd9636260af3e31997e2ad5ec071c4e7a0153 (diff)
downloadtor-691e542fd520edb8a1371eb42fa7b11b296616b9.tar.gz
tor-691e542fd520edb8a1371eb42fa7b11b296616b9.zip
Merge branch 'tor-gitlab/mr/605' into maint-0.4.5
Diffstat (limited to 'src')
-rw-r--r--src/core/or/channelpadding.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/or/channelpadding.c b/src/core/or/channelpadding.c
index d0c43e8bdc..d4c19491ac 100644
--- a/src/core/or/channelpadding.c
+++ b/src/core/or/channelpadding.c
@@ -186,7 +186,7 @@ channelpadding_get_netflow_inactive_timeout_ms(const channel_t *chan)
high_timeout = MAX(high_timeout, chan->padding_timeout_high_ms);
}
- if (low_timeout == high_timeout)
+ if (low_timeout >= high_timeout)
return low_timeout; // No randomization
/*