commit dcaf971a01f912d74a076d53baf7689460c3474e Merge: 3092c8bb3 c86013291 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 13 09:20:19 2017 -0400

Merge remote-tracking branch 'teor/bug23470-029'

changes/bug23470 | 6 ++++++ src/or/directory.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-)

diff --cc src/or/directory.c index fed4277de,f285e4c6e..89e2735e6 --- a/src/or/directory.c +++ b/src/or/directory.c @@@ -5321,18 -3701,13 +5321,13 @@@ connection_dir_finished_connecting(dir_ * Helper function for download_status_increment_failure(), * download_status_reset(), and download_status_increment_attempt(). */ STATIC const smartlist_t * -find_dl_schedule(download_status_t *dls, const or_options_t *options) +find_dl_schedule(const download_status_t *dls, const or_options_t *options) { - const int dir_server = dir_server_mode(options); - const int multi_d = networkstatus_consensus_can_use_multiple_directories( - options); - const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( - time(NULL)); - const int use_fallbacks = networkstatus_consensus_can_use_extra_fallbacks( - options); switch (dls->schedule) { case DL_SCHED_GENERIC: - if (dir_server) { + /* Any other directory document */ + if (dir_server_mode(options)) { + /* A directory authority or directory mirror */ return options->TestingServerDownloadSchedule; } else { return options->TestingClientDownloadSchedule;