mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 18:00:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5

Browse Source
This commit is contained in:
Nick Mathewson 2019-09-17 21:28:29 -04:00
commit 02840169d8
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug31657 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (guards):
- When tor is missing descriptors for some primary entry guards, make the
log message less alarming. It's normal for descriptors to expire, as long
as tor fetches new ones soon after. Fixes bug 31657;
bugfix on 0.3.3.1-alpha.

3
src/feature/client/entrynodes.c
View File

@ -3765,7 +3765,8 @@ guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs,
/* otherwise return a helpful error string */ /* otherwise return a helpful error string */
tor_asprintf(&ret_str, "We're missing descriptors for %d/%d of our " tor_asprintf(&ret_str, "We're missing descriptors for %d/%d of our "
"primary entry guards (total %sdescriptors: %d/%d).", "primary entry guards (total %sdescriptors: %d/%d). "
"That's ok. We will try to fetch missing descriptors soon.",
n_missing_descriptors, num_primary_to_check, n_missing_descriptors, num_primary_to_check,
using_mds?"micro":"", num_present, num_usable); using_mds?"micro":"", num_present, num_usable);

3
src/test/test_entrynodes.c
View File

@ -1723,7 +1723,8 @@ test_entry_guard_manage_primary(void *arg)
dir_info_str =guard_selection_get_err_str_if_dir_info_missing(gs, 1, 2, 3); dir_info_str =guard_selection_get_err_str_if_dir_info_missing(gs, 1, 2, 3);
tt_str_op(dir_info_str, OP_EQ, tt_str_op(dir_info_str, OP_EQ,
"We're missing descriptors for 1/2 of our primary entry guards " "We're missing descriptors for 1/2 of our primary entry guards "
"(total microdescriptors: 2/3)."); "(total microdescriptors: 2/3). That's ok. We will try to fetch "
"missing descriptors soon.");
tor_free(dir_info_str); tor_free(dir_info_str);
} }