diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-09-21 08:59:02 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-09-21 08:59:02 -0400 |
| commit | 0f84a5a6269d967dc8f140808c95e780e1782709 (patch) | |
| tree | 935a12307d1adc41fb41388c3986b9095d6cced5 /src/core | |
| parent | f9378eb5fa1f74287e937a0915da039be2a82c6f (diff) | |
| parent | 4dda47839c252bc0d2d544b95fed7e4600a7c54e (diff) | |
| download | tor-0f84a5a6269d967dc8f140808c95e780e1782709.tar.gz tor-0f84a5a6269d967dc8f140808c95e780e1782709.zip | |
Merge branch 'maint-0.4.8'
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/or/conflux_pool.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/or/conflux_pool.c b/src/core/or/conflux_pool.c index 46d36cf106..4a7e941372 100644 --- 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; |