nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/687' into maint-0.4.7

Browse Source
This commit is contained in:
David Goulet 2023-01-26 13:11:18 -05:00
commit e390a7cdee
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40745 Normal file
View File

@ -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.

2
src/core/or/relay.c
View File

@ -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. " "%s circuit has %d cells in its queue, maximum allowed is %d. "
"Closing circuit for safety reasons.", "Closing circuit for safety reasons.",
(exitward) ? "Outbound" : "Inbound", queue->n, (exitward) ? "Outbound" : "Inbound", queue->n,
max_circuit_cell_queue_size); max_queue_size);
circuit_mark_for_close(circ, END_CIRC_REASON_RESOURCELIMIT); circuit_mark_for_close(circ, END_CIRC_REASON_RESOURCELIMIT);
stats_n_circ_max_cell_reached++; stats_n_circ_max_cell_reached++;
return; return;