summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-01-05 18:54:11 +0000
committerRoger Dingledine <arma@torproject.org>2009-01-05 18:54:11 +0000
commite3388230c4c02c3fd83e38a87785ae815851578c (patch)
tree057bc2f62992c390024fefaa0ad2bfa3ecde1df1 /src
parent9e75c06197e449457ec83f98c6eb537716f352a9 (diff)
downloadtor-e3388230c4c02c3fd83e38a87785ae815851578c.tar.gz
tor-e3388230c4c02c3fd83e38a87785ae815851578c.zip
Bridge relays that had DirPort set to 0 would stop fetching
descriptors shortly after startup, and then briefly resume after a new bandwidth test and/or after publishing a new bridge descriptor. Bridge users that try to bootstrap from them would get a recent networkstatus but would get descriptors from up to 18 hours earlier, meaning most of the descriptors were obsolete already. Reported by Tas; bugfix on 0.2.0.13-alpha. svn:r17920
Diffstat (limited to 'src')
-rw-r--r--src/or/dirserv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 00ebf5d14a..eff0a380dc 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1215,7 +1215,8 @@ directory_permits_controller_requests(or_options_t *options)
int
directory_too_idle_to_fetch_descriptors(or_options_t *options, time_t now)
{
- return !options->DirPort && !options->FetchUselessDescriptors &&
+ return !directory_caches_dir_info(options) &&
+ !options->FetchUselessDescriptors &&
rep_hist_circbuilding_dormant(now);
}