commit 1a6814c096b0fa6fbfd2a1688b29dbc8143d6568 parent dfd3ed5bdc252ad2c3afed922e5dcd955eff1d68 Author: George Kadianakis <desnacked@riseup.net> Date: Wed, 25 Oct 2017 19:54:48 +0300 Fix offending unittest and add changes file for #23862. Diffstat:
| A | changes/bug23682 | | | 6 | ++++++ |
| M | src/test/test_routerlist.c | | | 3 | +-- |
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug23682 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 @@ -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);