commit 4edca4a02361a56d63d3b6a87b37ab707869bfad parent 424fe30f449679b99b8285c5732e1bab9a92e906 Author: David Goulet <dgoulet@torproject.org> Date: Tue, 16 Sep 2025 09:00:45 -0400 Merge branch 'tor-gitlab/mr/927' Diffstat:
| A | changes/ticket41037 | | | 4 | ++++ |
| M | src/core/or/conflux_pool.c | | | 5 | +++++ |
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/changes/ticket41037 b/changes/ticket41037 @@ -0,0 +1,4 @@ + o Minor bugfix (conflux): + - Remove the pending nonce if we realize that the nonce of the unlinked + circuit is not tracked anymore. Should avoid the non fatal assert + triggered with a control port circuit event. Fixes bug 41037; bugfix on 0.4.8.15. diff --git a/src/core/or/conflux_pool.c b/src/core/or/conflux_pool.c @@ -1461,6 +1461,11 @@ unlinked_circuit_closed(circuit_t *circ) /* This circuit is part of set that has already been removed previously freed * by another leg closing. */ if (!unlinked) { + /* This circuit is not Conflux related anymore regardless of its purpose so + * remove the pending nonce so after this function, the circuit is not + * considered conflux with CIRCUIT_IS_CONFLUX(). */ + tor_free(circ->conflux_pending_nonce); + circ->conflux_pending_nonce = NULL; return; }