Merge remote-tracking branch 'tor-github/pr/280'

This commit is contained in:
Nick Mathewson
2018-09-12 16:13:23 -04:00
5 changed files with 46 additions and 14 deletions
+2
View File
@@ -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;
}