[tor-commits] [tor/release-0.4.4] Avoid guard-related warning when upgrading from 043 to 044.

[dgoulet at torproject.org]

commit 53cd1c9710a14519443e578959a7a11ef8c23d8f
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 25 15:09:35 2020 +0300

    Avoid guard-related warning when upgrading from 043 to 044.
    
    Fixes #40105.
---
 changes/bug40105                | 3 +++
 src/feature/client/entrynodes.c | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changes/bug40105 b/changes/bug40105
new file mode 100644
index 0000000000..330b6a9744
--- /dev/null
+++ b/changes/bug40105
@@ -0,0 +1,3 @@
+  o Minor bugfixes (guard selection algorithm):
+    - Avoid needless guard-related warning when upgrading from 0.4.3 to 0.4.4.
+      Fixes bug 40105; bugfix on 0.4.4.1-alpha.
\ No newline at end of file
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 223815e7b2..45e484540c 100644
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -3139,9 +3139,9 @@ entry_guard_parse_from_state(const char *s)
 
     guard->sampled_idx = guard->confirmed_idx;
   } else {
-    log_warn(LD_GUARD, "The state file seems to be into a status that could"
-        " yield to weird entry node selection: we're missing both a"
-        " sampled_idx and a confirmed_idx.");
+    log_info(LD_GUARD, "The state file seems to be into a status that could"
+             " yield to weird entry node selection: we're missing both a"
+             " sampled_idx and a confirmed_idx.");
     guard->sampled_idx = invalid_sampled_idx++;
   }