Merge branch 'maint-0.4.7'

This commit is contained in:
David Goulet 2023-01-26 13:11:22 -05:00
commit fc11b38f2a
2 changed files with 4 additions and 1 deletions

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.

View File

@ -3274,7 +3274,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;