e9edcea0ca
Merge branch 'tor-gitlab/mr/275'
2021-06-29 10:55:46 -04:00
23451ef2fe
Merge branch 'maint-0.4.6'
2021-06-29 10:41:36 -04:00
f2647295c0
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-29 10:41:36 -04:00
fce99957e2
Suppress strict-prototypes warning on NSS pk11pub.h header
...
We already did this in a couple of places, but there are more that
we didn't get. This is necessary for systems with versions of
NSS that don't do their prototypes properly.
Fixes #40409 ; bugfix on 0.3.5.1-alpha.
2021-06-28 09:10:28 -04:00
2b97c1dd34
Merge remote-tracking branch 'tor-gitlab/mr/385'
2021-06-28 14:11:46 +03:00
45c8d69cbb
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-26 10:04:38 -04:00
45b5987115
Merge branch 'maint-0.4.6'
2021-06-26 10:04:38 -04:00
83483bd4f6
Enable deterministic RNG for address set tests.
...
This patch enables the deterministic RNG for address set tests,
including the tests which uses address set indirectly via the nodelist
API.
This should prevent random test failures in the highly unlikely case of
a false positive which was seen in tor#40419.
See: tpo/core/tor#40419.
2021-06-25 16:43:10 +00:00
270398fa31
Merge branch 'maint-0.4.6'
2021-06-18 14:29:15 -04:00
2c00ad36cd
Fix compilation on systems with older compilers.
...
This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.
See: tpo/core/tor#40410
2021-06-18 18:14:07 +00:00
d642da020e
Merge remote-tracking branch 'tor-gitlab/mr/338'
2021-06-14 13:10:18 -04:00
982829650c
Merge remote-tracking branch 'tor-gitlab/mr/397'
2021-06-14 13:05:03 -04:00
91aec8dbc1
Bump to 0.4.6.5-dev
2021-06-14 11:48:30 -04:00
9085508310
Bump to 0.4.5.9-dev
2021-06-14 11:47:41 -04:00
ec677c0c2e
Merge branch 'maint-0.4.6'
2021-06-10 12:30:30 -04:00
8e590992c4
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-10 12:30:29 -04:00
200e9a55e0
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-06-10 12:30:29 -04:00
0ae9fd62fd
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-06-10 12:30:11 -04:00
f57b5c48e0
Fix TROVE-2021-006: Out-of-bounds read on v3 desc parsing
2021-06-10 12:11:10 -04:00
0667eaa9bf
Merge branch 'maint-0.4.6'
2021-06-10 09:55:55 -04:00
7be37a26ac
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-10 09:55:55 -04:00
ae2254e490
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-06-10 09:55:55 -04:00
014345ed6a
Resolve remaining merge conflicts in relay.c
...
(My bad!)
2021-06-10 09:55:35 -04:00
8734eea31b
Merge branch 'maint-0.4.6'
2021-06-10 08:53:07 -04:00
3260d323a6
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-10 08:53:07 -04:00
ec696a95e5
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-06-10 08:53:07 -04:00
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
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
d9edf143ab
Merge branch 'maint-0.4.6'
2021-06-10 08:42:15 -04:00
69bd4a8a2d
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-10 08:42:15 -04:00
1da8621c0a
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-06-10 08:42:15 -04:00
31eaa81f59
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-06-10 08:42:15 -04:00
d71bf986b4
Merge branch 'bug40391_035' into maint-0.3.5
2021-06-10 08:41:59 -04:00
085bf61a35
Merge branch 'maint-0.4.6'
2021-06-10 08:37:34 -04:00
1d11675adb
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-10 08:37:34 -04:00
e2d01aac9e
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-06-10 08:37:34 -04:00
7c19a4d924
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-06-10 08:37:26 -04:00
7fdfc2ea54
Merge branch 'bug40390_035_squashed' into maint-0.3.5
2021-06-10 08:34:25 -04:00
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
a2e500f1ff
Merge branch 'maint-0.4.6'
2021-06-10 08:21:49 -04:00
cb38219664
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-10 08:21:48 -04:00
d60f8fe98a
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-06-10 08:21:48 -04:00
57a41348ee
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-06-10 08:21:47 -04:00
520d5c108f
Update geoip files to match ipfire location db, 2021/06/10.
2021-06-10 08:20:13 -04:00
d2256fe9ce
Modernize our libfuzzer usage to close #40407
...
Additionally, remove lingering references to hsv2 fuzzers from the
fuzzing_include_am.py script.
2021-06-08 12:47:57 -04:00
b3fe9d5162
Bump to 0.4.6.5
2021-06-07 13:32:07 -04:00
c80b98520b
Bump to 0.4.5.9.
2021-06-07 13:31:10 -04:00
1956f63d6b
Bump to 0.4.4.9
2021-06-07 13:30:18 -04:00
ed7f4ad4a9
Bump to 0.3.5.15.
2021-06-07 13:29:35 -04:00
6994a8d217
Merge branch 'maint-0.4.6'
2021-06-01 08:48:04 -04:00
David Goulet
Nick Mathewson
George Kadianakis
Alexander Færøy