summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-10-13 14:32:43 -0400
committerNick Mathewson <nickm@torproject.org>2014-10-13 14:32:43 -0400
commitd950e243328eaac40515b4b16ac328f6748c7a3f (patch)
tree6b8f2c8202137a277cb3576c0153392927408a8b /src/or/directory.c
parent032e3b733f7bf304a778459597e7ed7b371234c7 (diff)
parent9df61d7028936257538b15d1d3f8e04a370edb09 (diff)
downloadtor-d950e243328eaac40515b4b16ac328f6748c7a3f.tar.gz
tor-d950e243328eaac40515b4b16ac328f6748c7a3f.zip
Merge remote-tracking branch 'public/bug11243_squashed'
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 83cc56f352..f06b715fd2 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3442,6 +3442,9 @@ download_status_increment_failure(download_status_t *dls, int status_code,
void
download_status_reset(download_status_t *dls)
{
+ if (dls->n_download_failures == IMPOSSIBLE_TO_DOWNLOAD)
+ return; /* Don't reset this. */
+
const smartlist_t *schedule = find_dl_schedule_and_len(
dls, get_options()->DirPort_set);