torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,055 Commits 53 Branches 631 Tags
95080794eb4a76e9e42f99dbdd54f94de361ac84
Commit Graph

38055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 36b54fc6aa Merge branch 'maint-0.4.5' 
"ours" to avoid version bump.
 2021-03-16 09:18:40 -04:00
Nick Mathewson d66178c7b7 Bump version to 0.4.5.7-dev 2021-03-16 09:18:27 -04:00
Nick Mathewson e2dd8f1532 Merge branch 'maint-0.4.4' into maint-0.4.5 
"ours" to avoid version bump.
 2021-03-16 09:18:06 -04:00
Nick Mathewson 94fb308c5d Bump version to 0.4.4.8-dev 2021-03-16 09:17:56 -04:00
Nick Mathewson 5fac24053d Merge branch 'maint-0.3.5' into maint-0.4.4 
"ours" to avoid version bump.
 2021-03-16 09:17:40 -04:00
Nick Mathewson 3271c0bde7 Bump to 0.3.5.14-dev 2021-03-16 09:17:31 -04:00
Nick Mathewson 57d969de1a Copy forward ReleaseNotes and ChangeLogs for today's releases 2021-03-16 08:31:22 -04:00
Nick Mathewson 7c00afe0fb Merge branch 'maint-0.4.4' into maint-0.4.5 2021-03-15 09:41:38 -04:00
Nick Mathewson c306b0f511 Merge branch 'maint-0.4.5' 2021-03-15 09:41:38 -04:00
Nick Mathewson f2cfd1ffad Remove check-best-practices from check-local in 0.4.4 2021-03-15 09:41:19 -04:00
Nick Mathewson 2022d974af Fold ticket40314 into ChangeLog. 2021-03-15 09:35:56 -04:00
Nick Mathewson fcd42982b2 Remove changes files that will appear in 0.4.5.7 
(0.4.6.1-alpha will come out after the stable releases.)
 2021-03-15 09:03:37 -04:00
Nick Mathewson 61731e3550 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-03-15 09:01:59 -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 3268403ba1 Merge branch 'maint-0.4.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 a6533af9e8 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-03-15 08:54:00 -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 cfeb063f24 Merge branch 'maint-0.4.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 efb174df24 Merge branch 'maint-0.4.5' 2021-03-15 08:52:53 -04:00
Nick Mathewson 7c5a67ccd9 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-03-15 08:52:29 -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 f46f4562cf Merge branch 'bug40286_disable_min_035' into maint-0.3.5 2021-03-15 08:41:03 -04:00
Nick Mathewson 8e4965aa36 Bump to 0.4.6.1-alpha 2021-03-15 07:42:47 -04:00
Nick Mathewson dbf485c1f8 Merge branch 'maint-0.4.5' 2021-03-15 07:42:03 -04:00
Nick Mathewson be17a5a3cf Bump to 0.4.5.7 2021-03-15 07:41:54 -04:00
Nick Mathewson 5e771327af Merge branch 'maint-0.4.4' into maint-0.4.5 
"ours" to avoid version bump.
 2021-03-15 07:40:56 -04:00
Nick Mathewson fb2c889a38 Bump to 0.4.4.8 2021-03-15 07:40:48 -04:00
Nick Mathewson 8ada4263a9 Merge branch 'maint-0.3.5' into maint-0.4.4 
"ours" to avoid version bump.
 2021-03-15 07:40:06 -04:00
Nick Mathewson 1a0b5fd569 Bump to 0.3.5.14 2021-03-15 07:39:45 -04:00
Nick Mathewson 444233c15e Run "make autostyle" in advance of new series. 2021-03-12 11:40:48 -05:00
Nick Mathewson b5d08ddc09 Update copyrights to 2021, using "make update-copyright" 2021-03-12 11:39:23 -05:00
Nick Mathewson d7e827a754 Remove MMDB conversion tool. 
It was made to convert Maxmind's "mmdb" files into the older format
that we used.  But now thanks to IPFire Location, we don't have to
touch Maxmind formats any more.  (See ticket #40224.)
 2021-03-12 11:37:03 -05:00
Nick Mathewson 433f526af6 Merge branch 'maint-0.4.4' into maint-0.4.5 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 6cc5613404 Merge branch 'maint-0.4.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 b014866f6a Merge branch 'maint-0.4.4' into maint-0.4.5 2021-03-12 11:30:22 -05:00
Nick Mathewson 0b4a0c1a26 Merge branch 'maint-0.4.5' 2021-03-12 11:30:22 -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
Nick Mathewson 9131fe7eb2 Remove changes files already merged in release-0.4.5 2021-03-12 09:56:23 -05:00
Nick Mathewson 7d9403b422 Merge remote-tracking branch 'tor-gitlab/mr/336' 2021-03-10 16:47:46 -05:00
Nick Mathewson f98dbdb069 Merge branch 'maint-0.4.5' 2021-03-10 15:28:14 -05:00
Nick Mathewson e8d224dfb1 Merge remote-tracking branch 'tor-gitlab/mr/335' into maint-0.4.5 2021-03-10 15:27:50 -05:00
David Goulet 19e8844622 Merge branch 'maint-0.4.5' 2021-03-10 10:06:49 -05:00