mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 04:12:13 +02:00
Code
39,083 Commits 53 Branches 629 Tags 93 MiB
cbbfb812a8
Commit Graph

39083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
trinity-1686a
d4f32c83b5
add change file 2023-10-12 18:46:20 +02:00
trinity-1686a
efc7159e08
fix bridge transport statistics 2023-10-12 18:44:54 +02: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
David Goulet
e1102fdaf6 Merge branch 'bug40869_049' into 'main' 
Fix the spelling of maxunmeasur(e)dbw.

See merge request tpo/core/tor!772
 2023-10-11 18:52:40 +00:00
David Goulet
aa5e8510a3 Merge branch 'bug40869_048' into 'maint-0.4.8' 
Fix the spelling of maxunmeasur(e)dbw (backport to 0.4.8)

See merge request tpo/core/tor!774
 2023-10-11 18:51:44 +00: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
a02eef2a19
reject MinimalAcceptedServerVersion which would reject current version 
and fix memory leak on reload error path
 2023-10-08 14:23:29 +02:00
trinity-1686a
0dd74e4709
fill manpage and add changes entry 2023-10-07 17:55:33 +02:00
trinity-1686a
6dfb48894f
introduce MinimalAcceptedServerVersion 2023-10-07 17:35:57 +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
David Goulet
5e95ad55dc Merge branch 'obsolete_consensus_methods' into 'main' 
Remove consensus methods before #32

Closes #40835

See merge request tpo/core/tor!771
 2023-10-05 18:56:50 +00:00
Nick Mathewson
d2e03322a9 Add a changes file for removing pre-32 consensus methods (#40835) 2023-10-05 12:34:15 -04:00
Nick Mathewson
5b80a8f509 Remove MIN_METHOD_FOR_MIDDLEONLY 2023-10-05 09:07:47 -04:00
Nick Mathewson
a62ea32246 Remove MIN_METHOD_FOR_CORRECT_BWWEIGHTSCALE 
This also lets us discard extract_param_buggy, which we've been
wanting to do.
 2023-10-05 09:07:47 -04:00
Nick Mathewson
940a4c7eaa Remove tests that checked for obsolete microdesc encoding. 2023-10-05 09:07:47 -04:00
Nick Mathewson
8ebb726d4d Remove MIN_METHOD_FOR_UNPADDED_NTOR_KEY 2023-10-05 09:07:47 -04:00
Nick Mathewson
a2ab949a13 Remove MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS 2023-10-05 09:07:47 -04:00
Nick Mathewson
a7993bbd72 Whoops: test the "wrong" name for maxunmeasurdbw (sic). 
Now that we never use an earlier consensus method, our tests actually
hit this, and we find that we have misspelled "maxunmeasurdbw" (sic) in
dirvote.c.

I have opened ticket #40869 to track this misspelling.
 2023-10-05 09:07:37 -04:00
Nick Mathewson
a937648022 Update consensus methods in dir_umbw tests. 
These tests had previously listed methods that we no longer support.
 2023-10-05 08:45:23 -04:00
Nick Mathewson
5edc59bfd1 Increment MIN_SUPPORTED_CONSENSUS_METHOD to 32. 
Per proposal 290, all earlier consensus methods are obsolete, since 32 is the
highest method supported by 0.4.7.7.
 2023-10-05 08:11:41 -04:00
David Goulet
34b53ed8df Merge branch 'maint-0.4.8' 2023-09-25 10:44:24 -04:00
David Goulet
c11ba9dea8 version: Bump version to 0.4.8.7-dev 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-09-25 10:44:06 -04:00
David Goulet
7f3daa5bd2 scripts: Always exit 0 after git commit for geoip script 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2023-09-25 10:17:30 -04:00
David Goulet
69126f995f Merge branch 'maint-0.4.8' 2023-09-25 09:58:35 -04:00
Tor CI Release
edf395ecf6 version: Bump version to 0.4.8.7 2023-09-25 09:58:15 -04:00