diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-04 10:14:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-04 10:14:55 -0400 |
| commit | 978a2251f33416a95d5c2d8c8a844d1777d20429 (patch) | |
| tree | 7f6c83c6af16ac9cc0ee8925e73a69f8b80032c9 /src/or | |
| parent | 0a2fcc55c539f39b7a834fcd19a7043026783c4f (diff) | |
| parent | 3ea37e5faae2eefa2dda2136f43fbf677325e080 (diff) | |
| download | tor-978a2251f33416a95d5c2d8c8a844d1777d20429.tar.gz tor-978a2251f33416a95d5c2d8c8a844d1777d20429.zip | |
Merge remote-tracking branch 'arma/feature6760'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index 20a1e086a4..f3b781ec2f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -953,7 +953,8 @@ directory_info_has_arrived(time_t now, int from_cache) const or_options_t *options = get_options(); if (!router_have_minimum_dir_info()) { - int quiet = directory_too_idle_to_fetch_descriptors(options, now); + int quiet = from_cache || + directory_too_idle_to_fetch_descriptors(options, now); log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR, "I learned some more directory information, but not enough to " "build a circuit: %s", get_dir_info_status_string()); |