Merge remote-tracking branch 'arma/feature6760'

2 files changed, 8 insertions, 1 deletions

diff --git a/changes/feature6760 b/changes/feature6760
new file mode 100644
index 0000000000..cd94d4e8c4
--- /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 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());