[tor-commits] [tor/maint-0.3.3] Remove two vestigial MaxDownloadTries checks from directory.c

[nickm at torproject.org]

commit c0024edd2651761a2740d422a9dceca65c3721cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 15:08:46 2018 -0500

    Remove two vestigial MaxDownloadTries checks from directory.c
    
    These are no longer meaningful, since there's no longer an upper
    limit to how many times (in the exponential-backoff world) one can
    retry a download.  download_status_is_ready() didn't check these any
    more, and neither do we.
---
 src/or/directory.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index 3dbed28e7..34a34d9ba 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -5730,8 +5730,7 @@ dir_routerdesc_download_failed(smartlist_t *failed, int status_code,
     } else {
       dls = router_get_dl_status_by_descriptor_digest(digest);
     }
-    if (!dls || dls->n_download_failures >=
-                get_options()->TestingDescriptorMaxDownloadTries)
+    if (!dls)
       continue;
     download_status_increment_failure(dls, status_code, cp, server, now);
   } SMARTLIST_FOREACH_END(cp);
@@ -5768,10 +5767,6 @@ dir_microdesc_download_failed(smartlist_t *failed,
     if (!rs)
       continue;
     dls = &rs->dl_status;
-    if (dls->n_download_failures >=
-        get_options()->TestingMicrodescMaxDownloadTries) {
-      continue;
-    }
 
     { /* Increment the failure count for this md fetch */
       char buf[BASE64_DIGEST256_LEN+1];