diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-01-26 13:11:22 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-01-26 13:11:22 -0500 |
| commit | f7311346970e60b5a18e8fd5a54e7d8a8a7f88bc (patch) | |
| tree | 82db137ac6666916742d0ec8494d1826ff8f46b1 | |
| parent | ee3173c965f510e751c9284c352a40c81753a919 (diff) | |
| parent | e390a7cdee2dab0abcbaf06fad9d03b028377a70 (diff) | |
| download | tor-f7311346970e60b5a18e8fd5a54e7d8a8a7f88bc.tar.gz tor-f7311346970e60b5a18e8fd5a54e7d8a8a7f88bc.zip | |
Merge branch 'maint-0.4.7' into release-0.4.7
| -rw-r--r-- | changes/ticket40745 | 3 | ||||
| -rw-r--r-- | src/core/or/relay.c | 2 |
2 files changed, 4 insertions, 1 deletions
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; |