Merge branch 'tor-gitlab/mr/927'

diff --cc changes/ticket41037
index 0000000000000000000000000000000000000000,59e91ce62759a4798a5a31f0abf0e73c1e0efcc3..37a1ed969a2563446b43f1dc45d3eb74cd9ec889
mode 000000,100644..100644
--- /dev/null
--- 2/changes/ticket41037
+++ b/changes/ticket41037
@@@ -1,0 -1,6 +1,4 @@@
 -    - 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.
+   o Minor bugfix (conflux):
 -      triggered with a control port circuit event.
+     - 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 --cc src/core/or/conflux_pool.c
Simple merge