diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:39:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:39:51 -0400 |
| commit | e6980faec43504ac32ddd96d9c2bddcccca3a21b (patch) | |
| tree | aea893d8370deabe147299cb192b7967f1a7ece9 /src/or/networkstatus.c | |
| parent | acd6a4856bccff92eb241b18066ca7df577ab5f2 (diff) | |
| parent | 09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57 (diff) | |
| download | tor-e6980faec43504ac32ddd96d9c2bddcccca3a21b.tar tor-e6980faec43504ac32ddd96d9c2bddcccca3a21b.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/directory.c
Diffstat (limited to 'src/or/networkstatus.c')
| -rw-r--r-- | src/or/networkstatus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 663d1ad91..7fd3d365f 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1365,7 +1365,7 @@ update_networkstatus_downloads(time_t now) or_options_t *options = get_options(); if (should_delay_dir_fetches(options)) return; - if (directory_fetches_dir_info_early(options)) + if (authdir_mode_any_main(options) || options->FetchV2Networkstatus) update_v2_networkstatus_cache_downloads(now); update_consensus_networkstatus_downloads(now); update_certificate_downloads(now); |