Nick Mathewson
e71db3a4be
Merge remote-tracking branch 'tor-gitlab/mr/405'
2021-07-01 09:56:35 -04:00
Nick Mathewson
48ee68656a
Merge branch 'maint-0.4.6'
...
"ours" to avoid version bump.
2021-06-30 12:02:17 -04:00
Nick Mathewson
2758ae30b3
Bump to 0.4.6.6-dev
2021-06-30 12:01:21 -04:00
Nick Mathewson
810aa7095a
Tweak 0466 changelog
2021-06-30 10:09:28 -04:00
Nick Mathewson
f5feda5d04
Merge branch 'maint-0.4.6'
...
"ours" to avoid version bump.
2021-06-30 08:18:24 -04:00
Nick Mathewson
2fff1fc835
Update version to 0.4.6.6.
2021-06-30 08:17:56 -04:00
Nick Mathewson
1555646b36
Merge branch 'maint-0.4.6'
2021-06-30 08:15:41 -04:00
Nick Mathewson
4302c0b4a1
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-30 08:15:41 -04:00
Nick Mathewson
e60d14bb6b
Missing changes file for #40409
2021-06-30 08:14:57 -04:00
David Goulet
e9edcea0ca
Merge branch 'tor-gitlab/mr/275'
2021-06-29 10:55:46 -04:00
David Goulet
f2647295c0
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-29 10:41:36 -04:00
David Goulet
23451ef2fe
Merge branch 'maint-0.4.6'
2021-06-29 10:41:36 -04:00
Steven Engler
f944e46399
If TestingTorNetwork, skip perm check on the hs directory
2021-06-28 13:51:06 -04:00
Nick Mathewson
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
George Kadianakis
2b97c1dd34
Merge remote-tracking branch 'tor-gitlab/mr/385'
2021-06-28 14:11:46 +03:00
Nick Mathewson
45c8d69cbb
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-06-26 10:04:38 -04:00
Nick Mathewson
45b5987115
Merge branch 'maint-0.4.6'
2021-06-26 10:04:38 -04:00
Alexander Færøy
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
David Goulet
270398fa31
Merge branch 'maint-0.4.6'
2021-06-18 14:29:15 -04:00
Alexander Færøy
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
David Goulet
3f73ab3f0d
git: Don't pull github anymore in git-pull-all.sh
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-06-16 10:53:32 -04:00
Nick Mathewson
d642da020e
Merge remote-tracking branch 'tor-gitlab/mr/338'
2021-06-14 13:10:18 -04:00
Nick Mathewson
982829650c
Merge remote-tracking branch 'tor-gitlab/mr/397'
2021-06-14 13:05:03 -04:00
Nick Mathewson
ec2094a76e
Copy forward ChangeLog and ReleaseNotes from 0.3.5.15, 0.4.4.9, and 0.4.5.9
2021-06-14 11:55:48 -04:00
Nick Mathewson
e04831a0d2
Copy the 0.4.6.5 changelog and releasenotes to main.
2021-06-14 11:53:12 -04:00
Nick Mathewson
27c3254988
Remove 0.4.4 from list-tor-branches.
2021-06-14 11:50:00 -04:00
Nick Mathewson
806bc2442d
Merge branch 'maint-0.4.6'
...
"ours" to avoid version bump.
2021-06-14 11:48:46 -04:00
Nick Mathewson
91aec8dbc1
Bump to 0.4.6.5-dev
2021-06-14 11:48:30 -04:00
Nick Mathewson
e04e545173
Merge branch 'maint-0.4.5' into maint-0.4.6
...
"Ours" to avoid version bump.
2021-06-14 11:47:54 -04:00
Nick Mathewson
9085508310
Bump to 0.4.5.9-dev
2021-06-14 11:47:41 -04:00
Nick Mathewson
5ab97fa603
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-06-14 11:47:29 -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
ec677c0c2e
Merge branch 'maint-0.4.6'
2021-06-10 12:30:30 -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
0667eaa9bf
Merge branch 'maint-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
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
