Nick Mathewson
d6e2516031
Merge branch 'maint-0.3.5' into release-0.3.5
2021-06-10 08:21:47 -04:00
Nick Mathewson
520d5c108f
Update geoip files to match ipfire location db, 2021/06/10.
2021-06-10 08:20:13 -04:00
Nick Mathewson
60070546a7
remove rolled-up changes file.
2021-06-07 15:02:55 -04:00
Nick Mathewson
8a3c8925b8
start 0.3.5.15 changelog.
2021-06-07 15:02:43 -04:00
Nick Mathewson
fe328e2f33
Merge branch 'maint-0.3.5' into release-0.3.5
2021-06-07 13:32:35 -04:00
Nick Mathewson
ed7f4ad4a9
Bump to 0.3.5.15.
2021-06-07 13:29:35 -04:00
Alexander Færøy
a4e8624db1
Merge branch 'maint-0.3.5' into release-0.3.5
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
6dc3423e3e
Merge branch 'maint-0.3.5' into release-0.3.5
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
d6816de3e0
Merge branch 'maint-0.3.5' into release-0.3.5
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
5f35664b15
Merge branch 'maint-0.3.5' into release-0.3.5
2021-04-21 10:34:28 -04:00
George Kadianakis
c2997d7ee7
Merge remote-tracking branch 'tor-gitlab/mr/363' into release-0.3.5
2021-04-21 16:52:58 +03:00
George Kadianakis
32eea3b006
Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5
2021-04-21 16:48:22 +03:00
David Goulet
62002e8284
Merge branch 'maint-0.3.5' into release-0.3.5
2021-04-14 08:39:16 -04:00
David Goulet
131e2d99a4
fallbackdir: Remove two unspec lines
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-04-14 08:39:04 -04:00
Nick Mathewson
5e6905ed99
Fix test naming, and fix tests on windows.
...
This is a bugfix against my fix for #40133 , which has not yet
appeared in 0.3.5.
2021-04-13 17:38:31 -04:00
Nick Mathewson
b5a6de9e83
Merge branch 'maint-0.3.5' into release-0.3.5
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
8376fdb586
Merge branch 'maint-0.3.5' into release-0.3.5
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
1693b6151e
Merge branch 'maint-0.3.5' into release-0.3.5
2021-03-16 09:18:51 -04:00
Nick Mathewson
3271c0bde7
Bump to 0.3.5.14-dev
2021-03-16 09:17:31 -04:00
Nick Mathewson
50d4300e77
Copy 0.3.5.14 changelog to releasenotes
tor-0.3.5.14
2021-03-16 08:30:27 -04:00
Nick Mathewson
21a4e649af
changelog updates from arma
2021-03-15 17:12:36 -04:00
Nick Mathewson
0c66af2e69
Changelog for 0.3.5.14.
2021-03-15 09:27:26 -04:00
Nick Mathewson
0d04a9a829
Merge branch 'maint-0.3.5' into release-0.3.5
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
2b1c08567d
Merge branch 'maint-0.3.5' into release-0.3.5
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
72a0cdb1cd
Merge branch 'maint-0.3.5' into release-0.3.5
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
9dc1838693
Merge branch 'maint-0.3.5' into release-0.3.5
2021-03-15 07:42:55 -04:00
Nick Mathewson
1a0b5fd569
Bump to 0.3.5.14
2021-03-15 07:39:45 -04:00
Nick Mathewson
c9b4d4aa75
Merge branch 'maint-0.3.5' into release-0.3.5
2021-03-12 11:36:34 -05:00
Nick Mathewson
02230575c4
Remove maxmind license; add ipfire location database license (cc by-sa 4.0)
2021-03-12 11:36:28 -05:00
Nick Mathewson
c1ce126c74
Use the right ticket number.
2021-03-12 11:31:36 -05:00
Nick Mathewson
9bcd9523be
Merge branch 'maint-0.3.5' into release-0.3.5
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
2bc49d3828
Merge branch 'maint-0.3.5' into release-0.3.5
2021-03-01 08:24:28 -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
Nick Mathewson
fdd4bc3f43
Merge branch 'maint-0.3.5' into release-0.3.5
2021-02-03 13:39:54 -05:00
Nick Mathewson
21317c9229
Bump to 0.3.5.13-dev.
2021-02-03 13:37:28 -05:00
Nick Mathewson
cd60c6ec6b
copy changelog into releasenotes
2021-02-03 12:58:07 -05:00
Nick Mathewson
fc4d507748
Fold in the entry for 2667
tor-0.3.5.13
2021-02-03 09:53:41 -05:00
David Goulet
b9689553d6
Merge branch 'maint-0.3.5' into release-0.3.5
2021-02-03 09:11:14 -05:00