[tor] branch main updated (21109ba5d5 -> fc11b38f2a)
This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from 21109ba5d5 Merge branch 'maint-0.4.7' new bff6d7a944 relay: Use the right max queue size value in log new e390a7cdee Merge branch 'tor-gitlab/mr/687' into maint-0.4.7 new fc11b38f2a Merge branch 'maint-0.4.7' The 3 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/ticket40745 | 3 +++ src/core/or/relay.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changes/ticket40745 -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. commit bff6d7a944338a4f18f912dc977a33ef2416fb03 Author: David Goulet <dgoulet@torproject.org> AuthorDate: Wed Jan 25 14:10:20 2023 -0500 relay: Use the right max queue size value in log Fixes #40745 Signed-off-by: David Goulet <dgoulet@torproject.org> --- changes/ticket40745 | 3 +++ src/core/or/relay.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket40745 b/changes/ticket40745 new file mode 100644 index 0000000000..988dbc5f33 --- /dev/null +++ b/changes/ticket40745 @@ -0,0 +1,3 @@ + o Minor bugfix (relay, logging): + - The wrong max queue cell size was used in a protocol warning logging + statement. Fixes bug 40745; bugfix on 0.4.7.1-alpha. diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 39a7b783ab..d4df8ff7f5 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -3261,7 +3261,7 @@ append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan, "%s circuit has %d cells in its queue, maximum allowed is %d. " "Closing circuit for safety reasons.", (exitward) ? "Outbound" : "Inbound", queue->n, - max_circuit_cell_queue_size); + max_queue_size); circuit_mark_for_close(circ, END_CIRC_REASON_RESOURCELIMIT); stats_n_circ_max_cell_reached++; return; -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. commit e390a7cdee2dab0abcbaf06fad9d03b028377a70 Merge: 7b87ecf7e2 bff6d7a944 Author: David Goulet <dgoulet@torproject.org> AuthorDate: Thu Jan 26 13:11:18 2023 -0500 Merge branch 'tor-gitlab/mr/687' into maint-0.4.7 changes/ticket40745 | 3 +++ src/core/or/relay.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. commit fc11b38f2a483c0ea367800b943b0c8889ee07eb Merge: 21109ba5d5 e390a7cdee Author: David Goulet <dgoulet@torproject.org> AuthorDate: Thu Jan 26 13:11:22 2023 -0500 Merge branch 'maint-0.4.7' changes/ticket40745 | 3 +++ src/core/or/relay.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.
participants (1)
-
gitolite role