diff options
author | David Goulet <dgoulet@torproject.org> | 2023-10-30 13:46:20 -0400 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2023-10-30 13:46:20 -0400 |
commit | 7fe80138e35bde3f4f62226116df09e15893952c (patch) | |
tree | ce1999f4878375e936293c2c5a141b6f7db0a179 | |
parent | 4b74d45d641683c2b3e2ed8467668ef2a568800d (diff) | |
parent | 09685fa038bc7972cc4c38dc751ced35b8d29982 (diff) | |
download | tor-7fe80138e35bde3f4f62226116df09e15893952c.tar.gz tor-7fe80138e35bde3f4f62226116df09e15893952c.zip |
Merge branch 'maint-0.4.8'
-rw-r--r-- | changes/bug40878 | 4 | ||||
-rw-r--r-- | src/core/or/conflux_pool.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug40878 b/changes/bug40878 new file mode 100644 index 0000000000..503ace69da --- /dev/null +++ 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 index ec2938aefc..34417f8119 100644 --- 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: |