6bd94c8a47
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-25 08:23:06 -04:00
53cd1c9710
Avoid guard-related warning when upgrading from 043 to 044.
...
Fixes #40105 .
2020-08-25 15:09:57 +03:00
f50e21b5a7
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-25 14:51:23 +03:00
1397a86bbd
Merge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4
2020-08-25 14:51:05 +03:00
ff99089d41
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-20 14:34:56 +03:00
6e37086f85
v3 control: Persist ONION_CLIENT_AUTH_ADD client name
2020-08-20 14:34:21 +03:00
f5c9f6d432
hs: Don't overwrite DoS parameters on circuit with consensus params
...
Turns out that the HS DoS defenses parameters were overwritten by the
consensus parameters everytime a new consensus would arrive.
This means that a service operator can still enable the defenses but as soon
as the intro point relay would get a new consensus, they would be overwritten.
And at this commit, the network is entirely disabling DoS defenses.
Fix this by introducing an "explicit" flag that indicate if the
ESTABLISH_INTRO cell DoS extension set those parameters or not. If set, avoid
using the consenus at once.
We are not bumping the protover HSIntro value for this because 0.4.2.x series
is EOL in 1 month and thus 0.4.3.x would be the only series with this bug. We
are confident that a backport and then upgrade path to the latest 0.4.4.x
stable coming up soon is enough to mitigate this problem in the coming months.
It avoids the upgrade path on the service side by keeping the requirement for
protover HSIntro=5.
Fixes #40109
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-08-19 09:47:34 -04:00
c9e4ccf99b
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-19 13:56:33 +03:00
b1b0079675
Merge branch 'mr/124' into maint-0.4.4
2020-08-19 13:55:07 +03:00
974abdf632
Parallelize src/test/test into chunks.
...
First, we introduce a flag to teach src/test/test to split its work
into chunks. Then we replace our invocation of src/test/test in our
"make check" target with a set of 8 scripts that invoke the first
8th of the tests, the second 8th, and so on.
This change makes our "make -kj4 check" target in our hardened
gitlab build more than twice as fast, since src/test/test was taking
the longest to finish.
Closes 40098.
2020-08-19 13:46:50 +03:00
622b0f2fb1
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-18 08:49:07 -04:00
deea196370
Merge branch 'tor-gitlab/mr/121' into maint-0.4.4
2020-08-18 08:49:01 -04:00
7915b651d9
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-13 14:20:39 -04:00
8ca4782340
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-13 14:20:39 -04:00
ef18fb56c9
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-13 14:20:39 -04:00
45d9830493
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-13 14:20:39 -04:00
9b3e721d74
Changelog draft for 0.4.4.4-rc
2020-08-12 14:52:23 -04:00
f9bb49d870
Fix allocation counting in clean_v2_descs_as_dir test.
...
Without this fix, running this test on its own would fail.
Fixes bug 40099. Bugfix on ade5005853
2020-08-12 14:25:46 -04:00
0b1835be92
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-12 13:47:59 +03:00
5a1918d7e7
Merge remote-tracking branch 'tor-gitlab/mr/107' into maint-0.4.4
2020-08-12 13:47:34 +03:00
cce39dd915
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-12 13:23:33 +03:00
8e9edb93be
Merge remote-tracking branch 'tor-gitlab/mr/104' into maint-0.4.4
2020-08-12 13:23:08 +03:00
a02002dc99
Lower the minimum value for MaxMemInQueues to 64 MB for relays.
...
For clients, there is no minimum value; in both cases, we warn if
the value seems too low.
Closes ticket 24308.
2020-08-11 17:01:49 -04:00
872d369ce7
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-11 12:40:09 -04:00
d76f8457f3
Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4
2020-08-11 12:40:02 -04:00
912c8e6a8c
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-11 11:03:24 -04:00
2a7e71c956
Fix "run_check_subsystem_order.sh" to use $PYTHON.
...
Previously it just used /usr/bin/env/python, which would fail if we
only had a "python3" binary.
Fixes bug 40095; bugfix on 0.4.4.1-alpha.
2020-08-11 11:01:31 -04:00
39882a2021
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-11 14:54:26 +03:00
ab9c35f043
Merge remote-tracking branch 'tor-gitlab/mr/102' into maint-0.4.4
2020-08-11 14:53:03 +03:00
9316ca9f06
Remove a BUG() that could normally trigger in edge-cases.
2020-08-11 14:42:18 +03:00
08de260682
Merge branch 'bug40083_035' into bug40083_042
...
Fixes conflicts due to code movement.
2020-08-04 13:10:16 -04:00
62361cc698
Launch early reachability tests once a minute, not once a second.
...
This fixes bug 40083, which was introduced in 9f31908a
2020-08-04 13:05:07 -04:00
aef9c0f580
Merge branch 'ticket40081_035' into ticket40081_044
...
Resolves conflicts:
src/core/or/channel.c
src/test/test_channel.c
2020-08-03 11:49:09 -04:00
435f31aed3
Remove channel_is_canonical_is_reliable()
...
This function once served to let circuits continue to be built over
version-1 link connections. But such connections are long-obsolete,
and it's time to remove this check.
Closes #40081 .
2020-08-03 11:25:37 -04:00
ea876ab00e
Wipe address strings from connections before freeing them them.
...
This is a defense-in-depth fix; closes 6198.
2020-08-03 10:15:08 -04:00
e62e46d930
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-03 16:49:04 +03:00
18d2c7c5d7
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.4.4
2020-08-03 16:48:52 +03:00
e78a7450a2
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-31 02:03:34 +00:00
4e684c8695
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-31 02:03:34 +00:00
f04034536f
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-31 01:59:13 +00:00
b4400e2093
Merge branch 'bug40076_043' into bug40076_044
2020-07-30 14:28:11 -04:00
69d7752937
Merge branch 'bug40076_042' into bug40076_043
2020-07-30 14:27:29 -04:00
c2d5ec5e43
Merge branch 'maint-0.4.2' into bug40076_042
2020-07-30 14:27:29 -04:00
c4742b89b2
Fix a bug in buf_move_all() when the input buffer is empty.
...
We found this in #40076 , after we started using buf_move_all() in
more places. Fixes bug #40076 ; bugfix on 0.3.3.1-alpha. As far as
I know, the crash only affects master, but I think this warrants a
backport, "just in case".
2020-07-30 14:24:25 -04:00
fd1bd5bdce
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-29 12:37:08 -04:00
3b8bf743ae
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-29 12:37:07 -04:00
cdb0e6c252
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-29 12:37:07 -04:00
c7502b6503
Add a changes file from mr 86 for 40072 fix.
2020-07-29 12:36:56 -04:00
8d19118fd2
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-29 13:58:14 +00:00
8e690ce736
Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4
2020-07-29 13:57:47 +00:00
David Goulet
George Kadianakis
Neel Chauhan
Nick Mathewson
Alexander Færøy