aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Hansen Færøy <ahf@torproject.org>2024-10-28 11:30:25 +0000
committerAlexander Hansen Færøy <ahf@torproject.org>2024-10-28 11:30:25 +0000
commit444ee53d34bd44064365276156026f3b5540878e (patch)
tree1c69e92e482deb5e2bb3021037814357a5ab656c
parent0e21b79227a6588376ecfde21cd1af7661c5be0b (diff)
parent9cb7a19e22cfe23661e82aea11a274ce2173c138 (diff)
downloadtor-444ee53d34bd44064365276156026f3b5540878e.tar.gz
tor-444ee53d34bd44064365276156026f3b5540878e.zip
Merge branch 'whitespace' into 'main'
whitespace fix while debugging #40981 See merge request tpo/core/tor!841
-rw-r--r--src/core/or/circuituse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
index 6a73fbe87c..37c6cc3782 100644
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -1020,7 +1020,7 @@ circuit_stream_is_being_handled(entry_connection_t *conn,
if (CIRCUIT_IS_ORIGIN(circ) &&
!circ->marked_for_close &&
(circ->purpose == CIRCUIT_PURPOSE_C_GENERAL ||
- circ->purpose == CIRCUIT_PURPOSE_CONFLUX_LINKED) &&
+ circ->purpose == CIRCUIT_PURPOSE_CONFLUX_LINKED) &&
(!circ->timestamp_dirty ||
circ->timestamp_dirty + get_options()->MaxCircuitDirtiness > now)) {
origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ);