tor

commit 0f84a5a6269d967dc8f140808c95e780e1782709
parent f9378eb5fa1f74287e937a0915da039be2a82c6f
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 21 Sep 2023 08:59:02 -0400

Merge branch 'maint-0.4.8'

Diffstat:
A
changes/bug40862
 | 
3
+++
M
src/core/or/conflux_pool.c
 | 
7
++++++-

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/changes/bug40862 b/changes/bug40862
@@ -0,0 +1,3 @@
+  o Major bugfixes (conflux):
+    - Fix an issue that prevented us from pre-building more conflux sets after
+      existing sets had been used. Fixes bug 40862; bugfix on 0.4.8.1-alpha.
diff --git a/src/core/or/conflux_pool.c b/src/core/or/conflux_pool.c
@@ -1322,7 +1322,12 @@ count_client_usable_sets(void)
       log_warn(LD_BUG, "Client conflux linked set leg without a circuit");
       continue;
     }
-    if (!CONST_TO_ORIGIN_CIRCUIT(leg->circ)->unusable_for_new_conns) {
+
+    /* The maze marks circuits used several different ways. If any of
+     * them are marked for this leg, launch a new one. */
+    if (!CONST_TO_ORIGIN_CIRCUIT(leg->circ)->unusable_for_new_conns &&
+        !CONST_TO_ORIGIN_CIRCUIT(leg->circ)->isolation_values_set &&
+        !leg->circ->timestamp_dirty) {
       count++;
     }
   } DIGEST256MAP_FOREACH_END;