take out my IMPOSSIBLE_TO_DOWNLOAD+1 hack

svn:r17850

src/or/circuitbuild.c

@@ -3050,7 +3050,7 @@ fetch_bridge_descriptors(time_t now)
   SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge)
     {
       if (!download_status_is_ready(&bridge->fetch_status, now,
-                                    IMPOSSIBLE_TO_DOWNLOAD+1))
+                                    IMPOSSIBLE_TO_DOWNLOAD))
         continue; /* don't bother, no need to retry yet */
 
       /* schedule another fetch as if this one will fail, in case it does */

src/or/directory.c

@@ -3349,8 +3349,7 @@ download_status_increment_failure(download_status_t *dls, int status_code,
 
   if (dls->n_download_failures < schedule_len)
     increment = schedule[dls->n_download_failures];
-  else if (dls->n_download_failures == IMPOSSIBLE_TO_DOWNLOAD &&
-           dls->schedule != DL_SCHED_BRIDGE)
+  else if (dls->n_download_failures == IMPOSSIBLE_TO_DOWNLOAD)
     increment = INT_MAX;
   else
     increment = schedule[schedule_len-1];