Commit Graph

10608 Commits

Author SHA1 Message Date
David Goulet
7703c94756 Merge branch 'maint-0.4.8' 2023-11-09 09:24:22 -05:00
Tor CI Release
825aa705b1 fallbackdir: Update list generated on November 09, 2023 2023-11-09 09:23:59 -05:00
Tor CI Release
f822f24599 Update geoip files to match ipfire location db, 2023/11/09. 2023-11-09 09:23:54 -05:00
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
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
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
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
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
trinity-1686a
3970ee6a07 add changes/ and man entries for stream dos mitigation 2023-10-18 13:06:10 -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
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
Nick Mathewson
8c22fd4a4d Fix the spelling of maxunmeasur(e)dbw.
This has been misspelled when using consensus method 31 or later
since 0.4.6.1-alpha.  Fixes bug 40869.

This commit is a backport of b9b0abd6c2 to 0.4.8.
2023-10-11 10:08:53 -04:00
trinity-1686a
0dd74e4709
fill manpage and add changes entry 2023-10-07 17:55:33 +02:00
Nick Mathewson
b9b0abd6c2 Fix the spelling of maxunmeasur(e)dbw.
This has been misspelled when using consensus method 31 or later
since 0.4.6.1-alpha.  Fixes bug 40869.
2023-10-05 23:28:05 -04:00
Nick Mathewson
d2e03322a9 Add a changes file for removing pre-32 consensus methods (#40835) 2023-10-05 12:34:15 -04:00
David Goulet
d324c14a1f Merge branch 'maint-0.4.8' 2023-09-25 09:51:50 -04:00
Tor CI Release
f55e344601 fallbackdir: Update list generated on September 25, 2023 2023-09-25 09:51:25 -04:00
Tor CI Release
7675bd9be9 Update geoip files to match ipfire location db, 2023/09/25. 2023-09-25 09:51:25 -04:00
David Goulet
dec9a6946f Merge branch 'ahf/40638' into 'main'
Handle ntor and ntor_v3 individually in rephist and for MetricsPort.

Closes #40638

See merge request tpo/core/tor!767
2023-09-25 12:42:12 +00:00
David Goulet
0f84a5a626 Merge branch 'maint-0.4.8' 2023-09-21 08:59:02 -04:00
Mike Perry
4dda47839c Changes file for bug40862 2023-09-21 00:08:01 +00:00
Alexander Færøy
b855a786b6 Handle ntor and ntor_v3 individually in rephist and for MetricsPort.
This patch should not mess with the DoS protection here.

Fixes tpo/core/tor#40638.
2023-09-19 18:34:27 +02:00
David Goulet
160c8b89b3 Merge branch 'maint-0.4.8' 2023-09-18 09:52:00 -04:00
David Goulet
62c0f9ec79 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:51:59 -04:00
Tor CI Release
4a11b4b95c fallbackdir: Update list generated on September 18, 2023 2023-09-18 09:51:12 -04:00
Tor CI Release
4fc5fe7f69 Update geoip files to match ipfire location db, 2023/09/18. 2023-09-18 09:51:07 -04:00
David Goulet
ca9ca6da04 Merge branch 'sandbox-aarch64-riscv-fixes' into 'main'
Fix sandbox on AArch64, RISC-V

Closes #24454

See merge request tpo/core/tor!446
2023-09-18 13:14:51 +00:00
David Goulet
7278c1554d Merge branch 'ahf/android-gp-fixes-bulk' into 'main'
Bulk Android path changes

Closes #40487

See merge request tpo/core/tor!762
2023-09-18 13:12:36 +00:00
David Goulet
8425e1e575 Merge branch 'maint-0.4.8' 2023-09-18 09:11:06 -04:00
David Goulet
2c8430cb2f Merge branch 'tor-gitlab/mr/759' into maint-0.4.8 2023-09-18 09:11:02 -04:00
David Goulet
fada3c0d02 Merge branch 'maint-0.4.8' 2023-09-18 09:10:44 -04:00
David Goulet
cd2bc94c44 Merge branch 'tor-gitlab/mr/761' into maint-0.4.8 2023-09-18 09:10:39 -04:00
David Goulet
ac6bd88912 Merge branch 'maint-0.4.8' 2023-09-18 09:08:17 -04:00
David Goulet
5a2f46a7ba Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:08:17 -04:00
David Goulet
c0a10b259c Merge branch 'tor-gitlab/mr/764' into maint-0.4.7 2023-09-18 09:08:13 -04:00
David Goulet
bb44a0a544 Merge branch 'tor-gitlab/mr/765' into maint-0.4.7 2023-09-18 09:05:42 -04:00
Alexander Færøy
3a5bf0f5e6 Add changes file for tor#40859. 2023-09-14 22:43:12 +02:00
Alexander Færøy
3d160b37c2 Lower the log-level and soften the language for our Zstd ABI compat check.
See: tpo/core/tor#40815.
2023-09-14 22:26:41 +02:00
David Goulet
c884a07f08 Merge branch 'maint-0.4.8' 2023-09-14 15:34:26 -04:00