Nick Mathewson
014345ed6a
Resolve remaining merge conflicts in relay.c
...
(My bad!)
2021-06-10 09:55:35 -04:00
Nick Mathewson
8734eea31b
Merge branch 'maint-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
d9edf143ab
Merge branch 'maint-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
085bf61a35
Merge branch 'maint-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
a2e500f1ff
Merge branch 'maint-0.4.6'
2021-06-10 08:21:49 -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
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
Emily Bones
33e2c5962c
Add links to original design paper and anonbib
...
Closes #33742
2021-06-07 20:33:15 +00:00
Nick Mathewson
f93d9d8bac
Add a checklist to releasingtor.md
2021-06-07 13:51:05 -04:00
Nick Mathewson
c62bd0e708
Copy 0.4.5.8 changelog into the main branch changelog.
2021-06-07 13:50:53 -04:00
Nick Mathewson
4ea62b87d0
Merge branch 'maint-0.4.6'
...
"ours" to avoid version bump.
2021-06-07 13:32:18 -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
6c82015959
Merge branch 'maint-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
6994a8d217
Merge branch 'maint-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
ac64d19fed
copy 0.4.6.4-rc changelog forward
2021-05-28 12:27:48 -04:00
Nick Mathewson
b6329e9afa
Merge branch 'maint-0.4.6'
...
"ours" to avoid version bump.
2021-05-28 12:21:15 -04:00
Nick Mathewson
6ccb858058
Bump to 0.4.6.4-rc-dev
2021-05-28 12:20:48 -04:00
Nick Mathewson
407eb5d7cd
Merge branch 'maint-0.4.6'
...
"ours" to avoid version bump.
2021-05-28 08:05:00 -04:00
Nick Mathewson
aaf062119e
Bump to 0.4.6.4-rc.
2021-05-28 08:04:42 -04:00
Nick Mathewson
2ddd45bdb8
Merge branch 'maint-0.4.6'
2021-05-28 08:03:43 -04:00
Nick Mathewson
e1f0b9fb1e
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-05-28 08:03:43 -04:00
Nick Mathewson
8b6e919086
Stop using the "x$FOO" idiom in git-resquash.sh
...
The new version of shellcheck says that that this idiom is
unnecessary, and its presence here is making the shellcheck tests
fail.
No changes file needed, since this is not user-facing code.
2021-05-28 08:02:08 -04:00
Roger Dingledine
896ab165d9
clarify three comments
...
based on code-spelunking with nickm
2021-05-27 14:22:22 -04:00
Nick Mathewson
fc3d4e4c2f
Upgrade and rate-limit compression failure message.
...
Without this message getting logged at 'WARN', it's hard to
contextualize the messages we get about compression bombs, so this
message should fix #40175 .
I'm rate-limiting this, however, since it _could_ get spammy if
somebody on the network starts acting up. (Right now it should be
very quiet; I've asked Sebastian to check it, and he says that he
doesn't hit this message in practice.)
Closes #40175 .
2021-05-27 10:49:37 -04:00
David Goulet
111e6e7f26
Merge branch 'tor-gitlab/mr/359'
2021-05-27 10:12:16 -04:00
