This is an automated email from the git hooks/post-receive script.
dgoulet pushed a change to branch main in repository tor.
from b733f9d6ac Merge branch 'maint-0.4.7' new e41b680f50 Demote a warning about finding hops in path if no dir info. new 2ce5142718 Changes file for Bug #40603. new 84e31c00da Demote "Unexpected path length" log to info. new 254ca6717f Changes file for Bug 40612 new 1d6470a2a8 Merge branch 'maint-0.4.7'
The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: changes/bug40603 | 5 +++++ changes/bug40612 | 5 +++++ src/core/or/circuitbuild.c | 18 ++++++++++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 changes/bug40603 create mode 100644 changes/bug40612
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit e41b680f50e6f49b7167262281fbedf55a5ce8b4 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Wed Jun 15 14:13:09 2022 +0000
Demote a warning about finding hops in path if no dir info.
Leave it at notice if we do have enough dir info. --- src/core/or/circuitbuild.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 8027a96565..337bcfdd53 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -2520,8 +2520,19 @@ onion_extend_cpath(origin_circuit_t *circ) }
if (!info) { - log_warn(LD_CIRC,"Failed to find node for hop #%d of our path. Discarding " - "this circuit.", cur_len+1); + /* This can happen on first startup, possibly due to insufficient relays + * downloaded to pick vanguards-lite layer2 nodes, or other ephemeral + * reasons. It only happens briefly, is hard to reproduce, and then goes + * away for ever. :/ */ + if (!router_have_minimum_dir_info()) { + log_info(LD_CIRC, + "Failed to find node for hop #%d of our path. Discarding " + "this circuit.", cur_len+1); + } else { + log_notice(LD_CIRC, + "Failed to find node for hop #%d of our path. Discarding " + "this circuit.", cur_len+1); + } return -1; }
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 2ce5142718ff61c5dc754b0e845fcddf8a4a0c73 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Wed Jun 15 14:14:03 2022 +0000
Changes file for Bug #40603. --- changes/bug40603 | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/changes/bug40603 b/changes/bug40603 new file mode 100644 index 0000000000..aa00718a48 --- /dev/null +++ b/changes/bug40603 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Demote a harmless warn log message about finding a second hop to from + warn level to info level, if we do not have enough descriptors yet. + Leave it at notice level for other cases. Fixes bug 40603; + bugfix on 0.4.7.1-alpha.
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 84e31c00daa53b7af2bc4670b653b78eb8c5fc83 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Wed Jun 15 14:42:37 2022 +0000
Demote "Unexpected path length" log to info.
You win Maze; we surrender. --- src/core/or/circuitbuild.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 337bcfdd53..511df4112b 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1289,8 +1289,7 @@ circuit_finish_handshake(origin_circuit_t *circ, * don't seem able to do it, so there is some magic way that hops can * still get added. Perhaps some cases of circuit pre-build that change * purpose? */ - static ratelim_t cc_path_limit = RATELIM_INIT(600); - log_fn_ratelim(&cc_path_limit, LOG_NOTICE, LD_CIRC, + log_info(LD_CIRC, "Unexpected path length %d for exit circuit %d, purpose %d", circ_len, circ->global_identifier, TO_CIRCUIT(circ)->purpose);
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 254ca6717f4b1a7012efda42e42f6a3e37b6f454 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Wed Jun 15 14:43:52 2022 +0000
Changes file for Bug 40612 --- changes/bug40612 | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/changes/bug40612 b/changes/bug40612 new file mode 100644 index 0000000000..526f23bdd6 --- /dev/null +++ b/changes/bug40612 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Demote a notice log message about "Unexpected path length" to info + level. These cases seem to happen arbitrarily, and we likely will + never find all of them before the switch to arti. Fixes bug 40612; + bugfix on 0.4.7.5-alpha.
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 1d6470a2a83ca6bab8c52bcff5d0969b1866a4df Merge: b733f9d6ac 254ca6717f Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Jun 15 12:25:46 2022 -0400
Merge branch 'maint-0.4.7'
changes/bug40603 | 5 +++++ changes/bug40612 | 5 +++++ src/core/or/circuitbuild.c | 18 ++++++++++++++---- 3 files changed, 24 insertions(+), 4 deletions(-)
tor-commits@lists.torproject.org
-
gitolite role