Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2

2 files changed, 6 insertions, 1 deletions

diff --git a/changes/bug23861 b/changes/bug23861
new file mode 100644
index 0000000000..c6f017640d
--- /dev/null
+++ b/changes/bug23861
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, relay):
+    - Suppress a log notice when relay descriptors arrive. We already have a
+      bootstrap progress for this so no need to log notice everytime tor
+      receives relay descriptors. Microdescriptors behave the same. Fixes bug
+      23861; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/directory.c b/src/or/directory.c
index 836f862988..b3dbb0d1e0 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2889,7 +2889,7 @@ handle_response_fetch_desc(dir_connection_t *conn,
                                   conn->router_purpose,
                                   conn->base_.address)) {
         time_t now = approx_time();
-        directory_info_has_arrived(now, 0, 0);
+        directory_info_has_arrived(now, 0, 1);
       }
     }
   }