diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-10-30 13:46:19 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-10-30 13:46:19 -0400 |
| commit | 389b7d49036a69fa141b8b03da0b972d4c25ef49 (patch) | |
| tree | 7687c4996ba523422290db139c3ed95a99142cf3 | |
| parent | c59c30fedb2793fd8212307f18cefadb2be85f27 (diff) | |
| parent | 09685fa038bc7972cc4c38dc751ced35b8d29982 (diff) | |
| download | tor-389b7d49036a69fa141b8b03da0b972d4c25ef49.tar.gz tor-389b7d49036a69fa141b8b03da0b972d4c25ef49.zip | |
Merge branch 'maint-0.4.8' into release-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 4a7e941372..3a8f6ec8e3 100644 --- a/src/core/or/conflux_pool.c +++ b/src/core/or/conflux_pool.c @@ -1975,6 +1975,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: |