diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-09-12 16:13:23 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-09-12 16:13:23 -0400 |
commit | b4f20ec8a634dc734b103b1773d6565c876e7a24 (patch) | |
tree | 04d4bd1b3fe2c788b4ec08c9a7545210002991ba /src/core/or/channelpadding.c | |
parent | bfc847255afb093b89dd82687d796e3e3c7fcb89 (diff) | |
parent | c6a154e7b83377bffc130d757d3af3bcc124503e (diff) | |
download | tor-b4f20ec8a634dc734b103b1773d6565c876e7a24.tar.gz tor-b4f20ec8a634dc734b103b1773d6565c876e7a24.zip |
Merge remote-tracking branch 'tor-github/pr/280'
Diffstat (limited to 'src/core/or/channelpadding.c')
-rw-r--r-- | src/core/or/channelpadding.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/or/channelpadding.c b/src/core/or/channelpadding.c index 0a7e93d391..7c3a77f62c 100644 --- a/src/core/or/channelpadding.c +++ b/src/core/or/channelpadding.c @@ -657,6 +657,8 @@ channelpadding_get_circuits_available_timeout(void) // 30..60min by default timeout = timeout + crypto_rand_int(timeout); + tor_assert(timeout >= 0); + return timeout; } |