September 2019 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 5f00c03ed0327917409b074b99b7509c26128617 Merge: c3e94a8cc 9e674d0eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:38 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 7225cfc58671aaaeb2e17e7e46bc1f33b87ab22a Merge: 2013e63ac 5f00c03ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:38 2019 -0400 Merge branch 'maint-0.4.1'

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 02840169d860384257042bdf6d7601c2bf48b47b Merge: 50b45c43e 670d40262 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] entrynodes: Make routine descriptor expiry notice logs less alarming
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 670d4026219534558c809c48ba36b905d18ce35f Author: teor <teor(a)torproject.org> Date: Fri Sep 6 16:23:58 2019 +1000 entrynodes: Make routine descriptor expiry notice logs less alarming 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. --- changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug31657 b/changes/bug31657 new file mode 100644 index 000000000..08e9d95fd --- /dev/null +++ b/changes/bug31657 @@ -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. diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 819f90a6d..1bfb62538 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -3765,7 +3765,8 @@ guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs, /* otherwise return a helpful error string */ 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, using_mds?"micro":"", num_present, num_usable); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 8f0b96004..a486b13ae 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -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); tt_str_op(dir_info_str, OP_EQ, "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); }

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 77733021e654e5a17d59938a1e33c986c317ea7c Merge: 465a63c5f 02840169d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 5f00c03ed0327917409b074b99b7509c26128617 Merge: c3e94a8cc 9e674d0eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:38 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d Merge: a1f97bb25 02840169d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 21:28:37 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug31657 | 5 +++++ src/feature/client/entrynodes.c | 3 ++- src/test/test_entrynodes.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0