Browse Source

Fix offending unittest and add changes file for #23862.

George Kadianakis 6 years ago
parent
commit
1a6814c096
2 changed files with 6 additions and 2 deletions
  1. 5 0
      changes/bug23682
  2. 1 2
      src/test/test_routerlist.c

+ 5 - 0
changes/bug23682

@@ -0,0 +1,5 @@
+  o Minor bugfixes (entry guards):
+    - Tor now updates its guard state when it reads a consensus regardless of
+      whether it's missing descriptors. That makes tor use its primary guards
+      to fetch descriptors in some edge cases where it would have used fallback
+      directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha.

+ 1 - 2
src/test/test_routerlist.c

@@ -508,8 +508,7 @@ test_directory_guard_fetch_with_no_dirinfo(void *arg)
   tt_int_op(retval, OP_EQ, 0);
 
   /* Make sure that our primary guard was chosen */
-  /* BUG #23862 falls back to dirserver list!! */
-  expect_log_msg_containing("falling back to dirserver list");
+  expect_log_msg_containing("Selected primary guard router3");
 
  done:
   tor_free(consensus_text_md);