nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-19 20:46:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
36,188 Commits 53 Branches 629 Tags 108 MiB
release-0.4.4
Commit Graph

36188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
88b54f2a5b Merge branch 'maint-0.4.4' into release-0.4.4 2021-06-14 11:49:01 -04:00
Nick Mathewson
253b83b722 Merge branch 'maint-0.3.5' into maint-0.4.4 
"ours" to avoid version bump.
 2021-06-14 11:46:20 -04:00
Nick Mathewson
87492154e0 Bump to 0.3.5.15-dev 2021-06-14 11:45:30 -04:00
Nick Mathewson
dbe8cd3642 Copy ChangeLog into ReleaseNotes. 2021-06-14 10:51:02 -04:00
Nick Mathewson
9159538348 Pick a date, draft a blurb 2021-06-10 13:19:48 -04:00
Nick Mathewson
292865b894 Backport changelog entries 2021-06-10 13:14:11 -04:00
Nick Mathewson
7c07cf1afc Merge branch 'maint-0.4.4' into release-0.4.4 2021-06-10 12:30:29 -04:00
Nick Mathewson
0ae9fd62fd Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-10 12:30:11 -04:00
George Kadianakis
f57b5c48e0 Fix TROVE-2021-006: Out-of-bounds read on v3 desc parsing 2021-06-10 12:11:10 -04:00
Nick Mathewson
27a8bac500 Merge branch 'maint-0.4.4' into release-0.4.4 2021-06-10 09:55:55 -04:00
Nick Mathewson
014345ed6a Resolve remaining merge conflicts in relay.c 
(My bad!)
 2021-06-10 09:55:35 -04:00
Nick Mathewson
096644038c Merge branch 'maint-0.4.4' into release-0.4.4 2021-06-10 08:53:07 -04:00
Nick Mathewson
0f2d45328d Merge branch 'maint-0.3.5' into maint-0.4.4 
Conflicts resolved:
	src/core/or/relay.c
 2021-06-10 08:52:39 -04:00
David Goulet
adb248b6d6 TROVE-2021-003: Check layer_hint before half-closed end and resolve cells 
This issue was reported by Jann Horn part of Google's Project Zero.

Jann's one-sentence summary: entry/middle relays can spoof RELAY_END cells on
half-closed streams, which can lead to stream confusion between OP and
exit.

Fixes #40389
 2021-06-10 08:50:05 -04:00
Nick Mathewson
15617f29cb Merge branch 'maint-0.4.4' into release-0.4.4 2021-06-10 08:42:15 -04:00
Nick Mathewson
31eaa81f59 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-10 08:42:15 -04:00
Nick Mathewson
d71bf986b4 Merge branch 'bug40391_035' into maint-0.3.5 2021-06-10 08:41:59 -04:00
Nick Mathewson
aa4da024ad Merge branch 'maint-0.4.4' into release-0.4.4 2021-06-10 08:37:34 -04:00
Nick Mathewson
7c19a4d924 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-10 08:37:26 -04:00
Nick Mathewson
7fdfc2ea54 Merge branch 'bug40390_035_squashed' into maint-0.3.5 2021-06-10 08:34:25 -04:00
Nick Mathewson
c0aa9e0a1b Assert on _all_ failures from RAND_bytes(). 
Previously, we would detect errors from a missing RNG
implementation, but not failures from the RNG code itself.

Fortunately, it appears those failures do not happen in practice
when Tor is using OpenSSL's default RNG implementation.  Fixes bug
40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as
TROVE-2021-004. Reported by Jann Horn at Google's Project Zero.
 2021-06-10 08:33:57 -04:00
Nick Mathewson
0e2d413d2e Merge branch 'maint-0.4.4' into release-0.4.4 2021-06-10 08:21:48 -04:00
Nick Mathewson
57a41348ee Merge branch 'maint-0.3.5' into maint-0.4.4 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
6378002d2d remove rolled-up changes files. 2021-06-07 15:03:09 -04:00
Nick Mathewson
9c26614181 Start on a changelog for 0.4.4.9 2021-06-07 14:41:27 -04:00
Nick Mathewson
bffba45796 Merge branch 'maint-0.4.4' into release-0.4.4 2021-06-07 13:32:35 -04:00
Nick Mathewson
1956f63d6b Bump to 0.4.4.9 2021-06-07 13:30:18 -04:00
Nick Mathewson
6bcb0fb881 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-07 13:29:49 -04:00
Nick Mathewson
ed7f4ad4a9 Bump to 0.3.5.15. 2021-06-07 13:29:35 -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
4c06c619fa Use a more secure hash function for the circuitmux hashtable. 
Fixes bug 40931; bugfix on 0.2.4.4-alpha. Also tracked as
TROVE-2021-005.

This issue was reported by Jann Horn from Google's Project Zero.
 2021-05-18 08:40:09 -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
6088a73c73 Merge branch 'maint-0.4.4' into release-0.4.4 2021-04-21 10:34:28 -04:00
Nick Mathewson
87d96f7162 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-04-21 10:34:14 -04: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
eff0682842 Merge branch 'maint-0.4.4' into release-0.4.4 2021-04-14 08:39:16 -04:00
David Goulet
bba3393d20 Merge branch 'maint-0.3.5' into maint-0.4.4 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
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