tor

commit e390a7cdee2dab0abcbaf06fad9d03b028377a70
parent 7b87ecf7e2a789c742743aeff94550adb971edb5
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 26 Jan 2023 13:11:18 -0500

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

Diffstat:
A
changes/ticket40745
 | 
3
+++
M
src/core/or/relay.c
 | 
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/ticket40745 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
@@ -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;