summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug236825
-rw-r--r--src/test/test_routerlist.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug23682 b/changes/bug23682
new file mode 100644
index 0000000000..301ce73672
--- /dev/null
+++ b/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. \ No newline at end of file
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index b131dd9592..81451a4bc4 100644
--- a/src/test/test_routerlist.c
+++ b/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);