From: David Goulet <dgoulet@torproject.org>
Date: Tue, 16 Sep 2025 13:00:45 +0000 (-0400)
Subject: Merge branch 'tor-gitlab/mr/927'
X-Git-Tag: tor-0.4.9.3-alpha~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4edca4a02361a56d63d3b6a87b37ab707869bfad;p=thirdparty%2Ftor.git

Merge branch 'tor-gitlab/mr/927'
---

4edca4a02361a56d63d3b6a87b37ab707869bfad
diff --cc changes/ticket41037
index 0000000000,59e91ce627..37a1ed969a
mode 000000,100644..100644
--- a/changes/ticket41037
+++ b/changes/ticket41037
@@@ -1,0 -1,6 +1,4 @@@
+   o Minor bugfix (conflux):
 -    - Avoid a non fatal assert when describing a conflux circuit on the control
 -      port after being prepped to be freed. Fixes bug 41037; bugfix on 0.4.8.15.
+     - 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.
++      triggered with a control port circuit event. Fixes bug 41037; bugfix on 0.4.8.15.