Commit Graph

38955 Commits

Author SHA1 Message Date
David Goulet
12723de00b Merge branch 'maint-0.4.8' 2023-11-09 09:17:51 -05:00
David Goulet
be751a46e3 Merge branch 'ticket40883_048_01' into maint-0.4.8 2023-11-09 09:14:19 -05:00
David Goulet
525a1cfb70 Merge branch 'maint-0.4.8' 2023-11-09 09:10:58 -05:00
David Goulet
6df27ae953 Merge branch 'tor-gitlab/mr/778' into maint-0.4.8 2023-11-09 09:10:52 -05:00
David Goulet
54e37a013b Merge branch 'fix-man-typos' into 'main'
fix man page typos

See merge request tpo/core/tor!781
2023-11-09 13:41:53 +00:00
David Goulet
83aecca561 hs: Always check if the hs_ident is available when processing a cell
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-11-08 11:17:48 -05:00
David Goulet
e62b8bce5a hs: Fix assert in hs_metrics_update_by_ident()
The hs_metrics_failed_rdv() macro could pass a NULL value for the identity key
when a building circuit would end up in a failure path *before* the "hs_ident"
was able to be set which leading to this assert.

This was introduced in 0.4.8.1-alpha with the addition of rendezvous circuit
failure metrics for the MetricsPort.

This fixes TROVE-2023-006 for which its severity is considered high.

Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-11-07 13:50:28 -05:00
Alex Xu (Hello71)
25ac40b2b7 fix man page typos 2023-11-04 08:51:08 -04:00
David Goulet
769fa450ed Merge branch 'maint-0.4.8' 2023-11-03 10:54:06 -04:00
Tor CI Release
c7d8501da8 version: Bump version to 0.4.8.8-dev 2023-11-03 10:54:00 -04:00
David Goulet
3737585a54 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-11-03 10:53:57 -04:00
Tor CI Release
7c354390f9 version: Bump version to 0.4.7.16-dev 2023-11-03 10:51:10 -04:00
David Goulet
8257cd10f3 Merge branch 'maint-0.4.8' 2023-11-03 09:41:12 -04:00
Tor CI Release
f1df34193b Update geoip files to match ipfire location db, 2023/11/03. 2023-11-03 09:38:29 -04:00
Tor CI Release
ea6d6568e7 fallbackdir: Update list generated on November 03, 2023 2023-11-03 09:38:21 -04:00
David Goulet
3695e131d2 Merge branch 'maint-0.4.8' 2023-11-03 09:28:44 -04:00
David Goulet
f15408f487 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-11-03 09:28:37 -04:00
Tor CI Release
3e82c462ef version: Bump version to 0.4.8.8 2023-11-03 09:27:51 -04:00
Tor CI Release
3eb98d91e9 version: Bump version to 0.4.7.16 2023-11-03 09:27:38 -04:00
Tor CI Release
6901949d38 fallbackdir: Update list generated on November 03, 2023 2023-11-03 09:25:34 -04:00
Tor CI Release
ee152a421e Update geoip files to match ipfire location db, 2023/11/03. 2023-11-03 09:25:28 -04:00
David Goulet
de180e9a00 Merge branch 'maint-0.4.8' 2023-11-03 09:13:12 -04:00
David Goulet
a231461ad3 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-11-03 09:13:11 -04:00
David Goulet
4ce54614dd Sync geoip and fallbackdir from maint 048 before release
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-11-03 09:13:05 -04:00
David Goulet
bd8915ad8d Merge branch 'maint-0.4.8' 2023-11-03 09:04:27 -04:00
David Goulet
24dc829b9a Merge branch 'maint-0.4.7' into maint-0.4.8 2023-11-03 09:04:27 -04:00
Alexander Færøy
7aa496a2e0 Fix TROVE-2023-004: Remote crash when compiled against OpenSSL
Fixes #40874

Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-11-03 08:52:38 -04:00
Mike Perry
d4d78f5033 Bug 40876 changes file 2023-11-01 19:57:08 +00:00
Mike Perry
6bfadc7a5d Bug 40876: Extra logging 2023-11-01 19:57:08 +00:00
Mike Perry
d7f14a54fb Bug 40876: Don't reduce primary list for temporary restrictions 2023-11-01 19:57:07 +00:00
David Goulet
7fe80138e3 Merge branch 'maint-0.4.8' 2023-10-30 13:46:20 -04:00
Mike Perry
09685fa038 Changes file for bug 40878 2023-10-30 16:55:11 +00:00
Mike Perry
d9e7759088 Bug 40878: Count a valid conflux linked cell as valid data
For vanguards addon.
2023-10-30 16:54:49 +00:00
David Goulet
4b74d45d64 Merge branch 'fix-token-bucket-on-new-stream' into 'main'
Fix token bucket on new stream

Closes #40875

See merge request tpo/core/tor!779
2023-10-30 16:52:22 +00:00
trinity-1686a
798fe6c5ed
fix memory leak in dos stream for resolve requests 2023-10-29 19:16:49 +01:00
trinity-1686a
d3dadf51af
correctly parse consensus params for dos stream mitigation 2023-10-29 18:15:18 +01:00
trinity-1686a
eca9973e9e remove todos 2023-10-18 13:06:10 -04:00
trinity-1686a
0cf4966acf fix typos 2023-10-18 13:06:10 -04:00
trinity-1686a
3970ee6a07 add changes/ and man entries for stream dos mitigation 2023-10-18 13:06:10 -04:00
trinity-1686a
f8b259c2fe add metrics for rejected BEGIN/RESOLVE 2023-10-18 13:06:04 -04:00
trinity-1686a
1b907d13bb add rate limit on BEGIN and RESOLVE cell per circuit 2023-10-18 13:06:04 -04:00
trinity-1686a
379fb329d9 add configuration and network parameters for stream dos mitigation 2023-10-18 13:06:04 -04:00
David Goulet
cc31724f40 Merge branch 'ticket40870_048_02' into 'main'
conflux: Flag set as in full teardown in the free path

Closes #40870

See merge request tpo/core/tor!777
2023-10-18 14:40:18 +00:00
David Goulet
a382337be6 conflux: Flag set as in full teardown in the free path
We suspect a shutdown race of some sort for which the full teardown is not
noticed during the close but should be during the free.

For that, we flag the conflux set as in full teardown (if so) in the free path
in case the close path didn't caught it.

Fixes #40870

Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-10-16 21:18:57 +00:00
David Goulet
2a1fc47d86 Merge branch 'maint-0.4.8' 2023-10-12 12:41:34 -04:00
David Goulet
660f4b8f4a configure: Bump version to 0.4.8.8-dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-10-12 12:40:49 -04:00
David Goulet
a7b7989844 Merge branch 'eol-config' into 'main'
add configuration option to reject descriptor based on tor version

Closes #40817

See merge request tpo/core/tor!773
2023-10-12 14:36:33 +00:00
David Goulet
ea69bfe693 changes: Add changes file for MR 760
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-10-11 15:01:34 -04:00
David Goulet
dad173d3be Merge branch 'metrics-count-bug' into 'main'
add metrics counter for BUG() reached

Closes #40839

See merge request tpo/core/tor!760
2023-10-11 18:59:34 +00:00
David Goulet
e32a604987 Merge branch 'maint-0.4.8' 2023-10-11 14:55:15 -04:00