tor

commit 7fe80138e35bde3f4f62226116df09e15893952c
parent 4b74d45d641683c2b3e2ed8467668ef2a568800d
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon, 30 Oct 2023 13:46:20 -0400

Merge branch 'maint-0.4.8'

Diffstat:
A
changes/bug40878
 | 
4
++++
M
src/core/or/conflux_pool.c
 | 
3
+++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/changes/bug40878 b/changes/bug40878
@@ -0,0 +1,4 @@
+  o Minor bugfixes (vanguards addon support):
+    - Count the conflux linked cell as valid when it is successfully
+      processed. This will quiet a spurious warn in the vanguards addon.
+      Fixes bug 40878; bugfix on 0.4.8.1-alpha.
diff --git a/src/core/or/conflux_pool.c b/src/core/or/conflux_pool.c
@@ -1990,6 +1990,9 @@ conflux_process_linked(circuit_t *circ, crypt_path_t *layer_hint,
     connection_ap_attach_pending(1);
   }
 
+  /* This cell is now considered valid for clients. */
+  circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), cell_len);
+
   goto end;
 
  close: