David Goulet
6bd94c8a47
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-25 08:23:06 -04:00
George Kadianakis
53cd1c9710
Avoid guard-related warning when upgrading from 043 to 044.
...
Fixes #40105 .
2020-08-25 15:09:57 +03:00
George Kadianakis
f50e21b5a7
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-25 14:51:23 +03:00
George Kadianakis
1397a86bbd
Merge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4
2020-08-25 14:51:05 +03:00
George Kadianakis
ff99089d41
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-20 14:34:56 +03:00
Neel Chauhan
6e37086f85
v3 control: Persist ONION_CLIENT_AUTH_ADD client name
2020-08-20 14:34:21 +03:00
David Goulet
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
George Kadianakis
c9e4ccf99b
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-19 13:56:33 +03:00
George Kadianakis
b1b0079675
Merge branch 'mr/124' into maint-0.4.4
2020-08-19 13:55:07 +03:00
Nick Mathewson
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
David Goulet
622b0f2fb1
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-18 08:49:07 -04:00
David Goulet
deea196370
Merge branch 'tor-gitlab/mr/121' into maint-0.4.4
2020-08-18 08:49:01 -04:00
Nick Mathewson
7915b651d9
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-13 14:20:39 -04:00
Nick Mathewson
8ca4782340
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-13 14:20:39 -04:00
Nick Mathewson
ef18fb56c9
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-13 14:20:39 -04:00
Nick Mathewson
45d9830493
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-13 14:20:39 -04:00
Nick Mathewson
72484a4953
Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5
2020-08-13 14:20:27 -04:00
Nick Mathewson
a7cbbdbbda
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-13 09:44:30 -04:00
Nick Mathewson
26b257757b
Bump to 0.4.4.4-rc-dev
2020-08-13 09:43:54 -04:00
Nick Mathewson
34919368ce
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-12 20:21:04 -04:00
Nick Mathewson
07f0210a05
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-12 20:21:04 -04:00
Nick Mathewson
8bd79bd75e
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-12 20:21:04 -04:00
Nick Mathewson
9d77ed7be2
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-12 20:21:04 -04:00
Nick Mathewson
aeafb7f44f
Improve comments in .gitlab-ci.yml
2020-08-12 20:20:58 -04:00
Nick Mathewson
41a7ab96e5
CI: Turn on stem with 044 and later.
2020-08-12 20:13:18 -04:00
Nick Mathewson
a2e64b3e85
small edits to 0444-rc changelog
2020-08-12 19:53:27 -04:00
Nick Mathewson
9b3e721d74
Changelog draft for 0.4.4.4-rc
2020-08-12 14:52:23 -04:00
Nick Mathewson
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
Nick Mathewson
309eafbc3c
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-12 12:29:17 -04:00
Nick Mathewson
02bb719a94
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-12 12:29:17 -04:00
Nick Mathewson
f98b1988ec
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-12 12:29:17 -04:00
Nick Mathewson
1b3c206cf3
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-12 12:29:17 -04:00
Nick Mathewson
f5b9471547
CI: improve output when skipping doxygen
2020-08-12 12:28:44 -04:00
Nick Mathewson
50b7bd243f
Try disabling "make all" when checking docs.
2020-08-12 12:28:44 -04:00
Nick Mathewson
fe0e62ddc4
CI: Try to enable integration tests, hardening, and clang.
2020-08-12 11:29:46 -04:00
Nick Mathewson
16d5201af1
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-12 08:40:27 -04:00
Nick Mathewson
670f5632a5
Merge branch 'maint-0.4.3' into maint-0.4.4
...
"ours" merge to avoid MR 122 -- we already merged MR 123.
2020-08-12 08:40:10 -04:00
Nick Mathewson
489d33e190
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-12 08:39:41 -04:00
Nick Mathewson
6ef40144ae
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-12 08:39:41 -04:00
George Kadianakis
537be1da33
CI: Remove VS2015 AppVeyor build
2020-08-12 14:09:32 +03:00
George Kadianakis
8182f1351a
CI: Remove VS2015 AppVeyor build.
2020-08-12 14:05:21 +03:00
George Kadianakis
0b1835be92
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-12 13:47:59 +03:00
George Kadianakis
5a1918d7e7
Merge remote-tracking branch 'tor-gitlab/mr/107' into maint-0.4.4
2020-08-12 13:47:34 +03:00
George Kadianakis
cce39dd915
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-12 13:23:33 +03:00
George Kadianakis
8e9edb93be
Merge remote-tracking branch 'tor-gitlab/mr/104' into maint-0.4.4
2020-08-12 13:23:08 +03:00
Nick Mathewson
48cd932ed1
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-11 17:47:18 -04:00
Nick Mathewson
1770d1c216
bump version to 0.4.4.4-rc
2020-08-11 17:46:44 -04:00
Nick Mathewson
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
Nick Mathewson
431dcc42e0
Rename argument to compute_real_max_mem_in_queues()
2020-08-11 12:59:07 -04:00
Nick Mathewson
872d369ce7
Merge branch 'maint-0.4.4' into release-0.4.4
2020-08-11 12:40:09 -04:00
David Goulet
George Kadianakis
Neel Chauhan
Nick Mathewson