Nick Mathewson
6378002d2d
remove rolled-up changes files.
2021-06-07 15:03:09 -04:00
Alexander Færøy
f66fa8eba5
Merge branch 'maint-0.4.4' into release-0.4.4
2021-05-25 13:25:23 +00:00
Alexander Færøy
11c7e65730
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-05-25 13:25:23 +00:00
Nick Mathewson
42ba87d964
Remove the function tor_tls_assert_renegotiation_unblocked.
...
It was used nowhere outside its own unit tests, and it was causing
compilation issues with recent OpenSSL 3.0.0 alphas.
Closes ticket 40399.
2021-05-25 07:38:31 -04:00
Nick Mathewson
ef88ceedba
Merge branch 'maint-0.4.4' into release-0.4.4
2021-05-07 10:41:34 -04:00
Nick Mathewson
48dd87933d
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-05-07 10:41:33 -04:00
Nick Mathewson
e2c1ac214c
Reindent a few lines to fix a GCC warning.
...
As of GCC 11.1.1, the compiler warns us about code like this:
if (a)
b;
c;
and that's a good thing: we wouldn't want to "goto fail". But we
had an instance if this in circuituse.c, which was making our
compilation sad.
Fixes bug 40380; bugfix on 0.3.0.1-alpha.
2021-05-07 10:39:20 -04:00
Nick Mathewson
49740f020d
Merge branch 'maint-0.4.4' into release-0.4.4
2021-05-07 09:53:57 -04:00
Nick Mathewson
f68aeda549
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-05-07 09:53:57 -04:00
Nick Mathewson
621f8a304a
Update geoip files to match ipfire location db, 2021/05/07.
2021-05-07 09:53:46 -04:00
Nick Mathewson
bb6362c06c
Merge branch 'maint-0.4.4' into release-0.4.4
2021-04-13 16:59:16 -04:00
Nick Mathewson
59f6248e09
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-13 16:59:15 -04:00
David Goulet
ee7c50b8a7
fallbackdir: Renegerate list with 200 relays
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-04-13 15:15:58 -04:00
Nick Mathewson
f84ed7edaf
Merge branch 'maint-0.4.4' into release-0.4.4
2021-04-13 10:36:00 -04:00
Nick Mathewson
b323e6b8c2
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-13 10:36:00 -04:00
Nick Mathewson
32f5ad7665
Update geoip files to match ipfire location db, 2021/04/13.
2021-04-13 10:35:50 -04:00
Nick Mathewson
44df63e591
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-24 12:25:05 -04:00
David Goulet
9ca2394d6b
channel: Fix use after free in channel_do_open_actions()
...
Fortunately, our tor_free() is setting the variable to NULL after so we were
in a situation where NULL was always used instead of the transport name.
This first appeared in 894ff2dc84 and results in
basically no bridge with a transport being able to use DoS defenses.
Fixes #40345
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-03-23 09:19:41 -04:00
Nick Mathewson
ecdc6ac498
Changelog for 0.4.4.8.
2021-03-15 09:25:02 -04:00
Nick Mathewson
5ec579610a
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 09:01:59 -04:00
Nick Mathewson
ecf1ba9746
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-15 09:01:59 -04:00
Nick Mathewson
f078aab71e
Merge branch 'bug40316_035_v2' into maint-0.3.5
2021-03-15 08:58:54 -04:00
Nick Mathewson
890ae4fb1a
Fix detection of point to insert signatures on a pending consensus.
...
We were looking for the first instance of "directory-signature "
when instead the correct behavior is to look for the first instance
of "directory-signature " at the start of a line.
Unfortunately, this can be exploited as to crash authorities while
they're voting.
Fixes #40316 ; bugfix on 0.2.2.4-alpha. This is TROVE-2021-002,
also tracked as CVE-2021-28090.
2021-03-15 08:56:58 -04:00
Nick Mathewson
2eb900f7e2
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 08:54:00 -04:00
Nick Mathewson
b3c891119c
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-15 08:54:00 -04:00
Nick Mathewson
efca9ce41c
Clarify new intended strategy with TROVE-2021-001
...
We're going to disable this feature in all versions for now.
2021-03-15 08:53:36 -04:00
Nick Mathewson
b9f6539008
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-15 08:52:28 -04:00
Nick Mathewson
4a538847a8
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-15 08:52:28 -04:00
Nick Mathewson
f46f4562cf
Merge branch 'bug40286_disable_min_035' into maint-0.3.5
2021-03-15 08:41:03 -04:00
Nick Mathewson
1a407612bc
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-12 11:36:34 -05:00
Nick Mathewson
9f59b6f458
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-12 11:36:34 -05:00
Nick Mathewson
c1ce126c74
Use the right ticket number.
2021-03-12 11:31:36 -05:00
Nick Mathewson
877f7bbb47
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-12 11:30:21 -05:00
Nick Mathewson
41796158e6
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-03-12 11:30:21 -05:00
Nick Mathewson
aa6c7741e8
update geoip-2021-03-12 to mention provider transition.
2021-03-12 11:29:09 -05:00
Nick Mathewson
a7b3cb06f5
Update geoip files to match ipfire location db, 2021/03/12.
2021-03-12 11:26:07 -05:00
David Goulet
34ad10db54
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-01 08:33:47 -05:00
David Goulet
ad4f87ed3f
Remove mallinfo() from codebase
...
Now deprecated in libc >= 2.33
Closes #40309
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-23 12:16:58 -05:00
David Goulet
296a557bfc
Remove mallinfo() from codebase
...
Now deprecated in libc >= 2.33
Closes #40309
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-23 11:02:33 -05:00
Nick Mathewson
ede88c374c
Disable the dump_desc() function.
...
It can be called with strings that should have been
length-delimited, but which in fact are not. This can cause a
CPU-DoS bug or, in a worse case, a crash.
Since this function isn't essential, the best solution for older
Tors is to just turn it off.
Fixes bug 40286; bugfix on 0.2.2.1-alpha when dump_desc() was
introduced.
2021-02-19 12:31:19 -05:00
Alexander Færøy
49c61c1bb8
Delete changes/40241_v2 as it breaks CI.
...
Unreviewed build fix. Discussed the cnage on IRC with Nick.
2021-02-05 19:18:13 +00:00
Nick Mathewson
37a32b7ee7
Fold in the entry for 2667
2021-02-03 09:53:47 -05:00
David Goulet
3e618aae1a
Merge branch 'maint-0.4.4' into release-0.4.4
2021-02-03 08:44:19 -05:00
Nick Mathewson
6d8f6d5b0a
Start a changelog for 0.4.4.7
2021-02-02 15:54:33 -05:00
David Goulet
b2434d30d2
Merge branch 'tor-gitlab/mr/285' into ticket2667_044_01
2021-01-29 14:54:21 -05:00
David Goulet
705fd37875
Merge branch 'tor-gitlab/mr/284' into ticket2667_043_01
2021-01-29 14:51:38 -05:00
Roger Dingledine
93ac6ec4d3
exit: Deny re-entry into the network
...
Exit relays now reject exit attempts to known relay addresses + ORPort and
also to authorities on the ORPort and DirPort.
Closes #2667
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-29 14:19:17 -05:00
David Goulet
b256d83c3e
Merge branch 'maint-0.4.4' into release-0.4.4
2021-01-28 12:46:31 -05:00
David Goulet
ea38016202
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:46:31 -05:00
David Goulet
79cb47cfc2
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:46:31 -05:00