nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'teor/bug22421'

Browse Source
This commit is contained in:
Nick Mathewson 2017-05-30 08:42:20 -04:00
commit f9615f9d77
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/config.c
View File

@ -558,11 +558,13 @@ static config_var_t option_vars_[] = {
"10800, 21600, 43200"), "10800, 21600, 43200"),
/* With the ClientBootstrapConsensus*Download* below: /* With the ClientBootstrapConsensus*Download* below:
* Clients with only authorities will try: * Clients with only authorities will try:
* - 3 authorities over 10 seconds, then wait 60 minutes. * - at least 3 authorities over 10 seconds, then exponentially backoff,
* with the next attempt 3-21 seconds later,
* Clients with authorities and fallbacks will try: * Clients with authorities and fallbacks will try:
* - 2 authorities and 4 fallbacks over 21 seconds, then wait 60 minutes. * - at least 2 authorities and 4 fallbacks over 21 seconds, then
* exponentially backoff, with the next attempts 4-33 seconds later,
* Clients will also retry when an application request arrives. * Clients will also retry when an application request arrives.
* After a number of failed reqests, clients retry every 3 days + 1 hour. * After a number of failed requests, clients retry every 3 days + 1 hour.
* *
* Clients used to try 2 authorities over 10 seconds, then wait for * Clients used to try 2 authorities over 10 seconds, then wait for
* 60 minutes or an application request. * 60 minutes or an application request.