[tor-commits] [tor/maint-0.2.8] fix a bug where relays would use the aggressive client bootstrapping retry number

[nickm at torproject.org]

commit 1f72653544272e24d685bd81abe2da5d32b67caf
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Apr 14 03:03:47 2016 -0400

    fix a bug where relays would use the aggressive client bootstrapping retry number
---
 src/or/networkstatus.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 6b40852..3d8bb55 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -871,8 +871,7 @@ update_consensus_networkstatus_downloads(time_t now)
       update_consensus_bootstrap_multiple_downloads(now, options);
     } else {
       /* Check if we failed downloading a consensus too recently */
-      int max_dl_tries = consensus_max_download_tries(options,
-                                                      we_are_bootstrapping);
+      int max_dl_tries = consensus_max_download_tries(options, 0);
 
       /* Let's make sure we remembered to update consensus_dl_status */
       tor_assert(consensus_dl_status[i].schedule == DL_SCHED_CONSENSUS);