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
37,418 Commits 53 Branches 631 Tags
58ad0302ea9acea48308f35dce4afa986919a151
Commit Graph
37418 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 58ad0302ea Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 12:30:29 -04:00
Nick Mathewson 8e590992c4 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 12:30:29 -04:00
Nick Mathewson 200e9a55e0 Merge branch 'maint-0.4.4' into maint-0.4.5 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 5481412cd7 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 09:55:55 -04:00
Nick Mathewson 7be37a26ac Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 09:55:55 -04:00
Nick Mathewson ae2254e490 Merge branch 'maint-0.4.4' into maint-0.4.5 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 a2b0d7ead4 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 08:53:07 -04:00
Nick Mathewson 3260d323a6 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 08:53:07 -04:00
Nick Mathewson ec696a95e5 Merge branch 'maint-0.4.4' into maint-0.4.5 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 f6ebe8b920 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 08:42:15 -04:00
Nick Mathewson 69bd4a8a2d Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 08:42:15 -04:00
Nick Mathewson 1da8621c0a Merge branch 'maint-0.4.4' into maint-0.4.5 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 c58c2d4e37 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 08:37:34 -04:00
Nick Mathewson 1d11675adb Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 08:37:34 -04:00
Nick Mathewson e2d01aac9e Merge branch 'maint-0.4.4' into maint-0.4.5 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 9e5e584cb6 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 08:21:48 -04:00
Nick Mathewson cb38219664 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 08:21:48 -04:00
Nick Mathewson d60f8fe98a Merge branch 'maint-0.4.4' into maint-0.4.5 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 009b5778b2 remove rolled-up changes file. 2021-06-07 15:03:27 -04:00
Nick Mathewson c3e473c3de Start ReleaseNotes for 0.4.6.5. 
This is a sorted version of the entries from the earlier 0.4.6.x
releases, excluding those that fixed bugs against 0.4.6.x, or those
that already appeared in 0.4.5.8.
 2021-06-07 14:08:19 -04:00
Nick Mathewson 23e6551a73 Copy 0.4.5.8 changelog in to changelog and releasenotes. 2021-06-07 13:50:28 -04:00
Nick Mathewson 5d91a3bcaf Begin a ChangeLog for 0.4.6.5 2021-06-07 13:47:46 -04:00
Nick Mathewson 0d402eefa5 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-07 13:32:36 -04:00
Nick Mathewson b3fe9d5162 Bump to 0.4.6.5 2021-06-07 13:32:07 -04:00
Nick Mathewson 66701c6195 Merge branch 'maint-0.4.5' into maint-0.4.6 
"ours" to avoid version bump.
 2021-06-07 13:31:21 -04:00
Nick Mathewson c80b98520b Bump to 0.4.5.9. 2021-06-07 13:31:10 -04:00
Nick Mathewson b3ca2faf46 Merge branch 'maint-0.4.4' into maint-0.4.5 
"ours" to avoid version bump.
 2021-06-07 13:30:36 -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
Nick Mathewson 9a37cf4883 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-01 12:16:42 -04:00
Nick Mathewson f832b4bcee Merge branch 'bug40175_045' into maint-0.4.6 2021-06-01 12:16:35 -04:00
Nick Mathewson 9348b1b440 changes file for #40175 2021-06-01 12:16:06 -04:00
David Goulet ae154215cb Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-01 08:48:04 -04:00
David Goulet 83009f8003 Merge branch 'tor-gitlab/mr/393' into maint-0.4.6 2021-06-01 08:47:56 -04:00
Nick Mathewson bcff7f9df9 Merge branch 'maint-0.4.6' into release-0.4.6 2021-05-28 12:21:27 -04:00
Nick Mathewson 6ccb858058 Bump to 0.4.6.4-rc-dev 2021-05-28 12:20:48 -04:00
Nick Mathewson 55b501a865 Pick a release date. tor-0.4.6.4-rc 2021-05-28 09:57:27 -04:00