commit 3ea37e5faae2eefa2dda2136f43fbf677325e080 Author: Roger Dingledine arma@torproject.org Date: Mon Sep 3 19:49:44 2012 -0400

quiet "I learned some more directory information" on startup

Reserve it for when new directory information arrives in response to a fetch.

Resolves ticket 6760. --- changes/feature6760 | 6 ++++++ src/or/main.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/changes/feature6760 b/changes/feature6760 new file mode 100644 index 0000000..cd94d4e --- /dev/null +++ b/changes/feature6760 @@ -0,0 +1,6 @@ + o Minor features: + - Don't log "I learned some more directory information" when we're + reading cached directory information. Reserve it for when new + directory information arrives in response to a fetch. Resolves + ticket 6760. + diff --git a/src/or/main.c b/src/or/main.c index 20a1e08..f3b781e 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());