[tor-commits] [tor/master] Update the client bootstrap comment in config.c for exponential backoff

[nickm at torproject.org]

commit 25ea8be9de9137d61daaa20237698aeeb2dc03e8
Author: teor <teor2345 at gmail.com>
Date:   Sun May 28 21:01:08 2017 +1000

    Update the client bootstrap comment in config.c for exponential backoff
    
    This brings the description up to date with the exponential backoff
    code introduced in 0.2.9.1-alpha.
    
    Fixes bug #22421.
---
 src/or/config.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index c96f42c..7d2ebbd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -558,11 +558,13 @@ static config_var_t option_vars_[] = {
                                  "10800, 21600, 43200"),
   /* With the ClientBootstrapConsensus*Download* below:
    * 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:
-   *  - 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.
-   * 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
    * 60 minutes or an application request.