cc4e42ee32
Merge remote-tracking branch 'tor-gitlab/mr/115'
2020-08-25 15:43:00 +03:00
6dc0b04319
Merge branch 'maint-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
4b9ed14d9b
Merge remote-tracking branch 'tor-gitlab/mr/108'
2020-08-25 15:02:04 +03:00
935160ce86
Merge branch 'maint-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
36203e8894
Merge branch 'maint-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
4e3f55fba1
Merge branch 'maint-0.4.4'
2020-08-19 13:56:34 +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
1089ac6f22
Merge branch 'tor-gitlab/mr/126'
2020-08-18 08:56:27 -04:00
80d2376f33
Merge branch 'maint-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
ebaa1a1d23
Make options_init_from_torrc smaller #40102
...
Split implementation of several command line options from
options_init_from_torrc into smaller isolated functions.
2020-08-14 16:01:02 +01:00
563f8610fd
Revise trac.torproject.org urls to refer to gitlab replacements.
...
Closes #40101 .
2020-08-14 09:21:28 -04:00
7915b651d9
Merge branch 'maint-0.4.2' into maint-0.4.3
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
8669ace2fb
Merge branch '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
26b257757b
Bump to 0.4.4.4-rc-dev
2020-08-13 09:43:54 -04:00
7b4716a762
Make test_glob() pass even when run as root.
...
Previously the test relied on not being able to look inside 000
directories, which is a thing root _can_ do.
Bug not in any released Tor version.
2020-08-12 20:36:23 -04:00
9ef991dbe3
Use correct type for gl_closedir to avoid a compiler warning
2020-08-12 14:42:30 -04:00
e151442037
Merge remote-tracking branch 'tor-gitlab/mr/62'
2020-08-12 14:37:21 -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
60c436d14d
Attempt to fix test_include.py on TravisCI #25140
2020-08-12 14:35:51 +01:00
347f87ae9d
Merge branch 'maint-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
c591a0d246
Merge branch 'maint-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
4fdec27a12
Remove extraneous EVENT_CONTROLLER_WAIT
...
This turned into a new StreamStatus value.
Closes #40092 . Bug not in any released Tor.
2020-08-11 18:41:15 -04:00
1770d1c216
bump version to 0.4.4.4-rc
2020-08-11 17:46:44 -04: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
0b633b1f6d
Improved documentation and comments #25140
2020-08-11 18:26:41 +01:00
431dcc42e0
Rename argument to compute_real_max_mem_in_queues()
2020-08-11 12:59:07 -04:00
d76f8457f3
Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4
2020-08-11 12:40:02 -04:00
11961f0bc5
Merge remote-tracking branch 'tor-gitlab/mr/119'
2020-08-11 12:39:30 -04:00
b705cfa024
Merge remote-tracking branch 'tor-gitlab/mr/111'
2020-08-11 15:12:43 +03:00
f971a8fbad
Merge branch 'mr/105'
2020-08-11 15:04:15 +03:00
7df52b71bf
Only log port self-testing message when we are _starting_ to test.
...
(Unlike approaches in earlier versions of Tor, this one logs if and
only if we are launching a test, and we haven't said that we're
testing this port.)
Fixes bug 40068; bug not in any released version.
Closes #40068 .
2020-08-11 15:02:44 +03:00
b8003fbe99
Merge branch 'maint-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
069946852a
Merge branch 'maint-0.4.4'
2020-08-10 19:33:07 -04:00
7d80bf80fe
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-08-10 19:33:07 -04:00
f3fcc89d05
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-08-10 19:33:06 -04:00
68f8250cbb
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-10 19:32:49 -04:00
e873c7e893
small code tweaks to try to work around debian stable complaints
2020-08-10 19:20:05 -04:00
3eb9331133
Merge remote-tracking branch 'tor-gitlab/mr/110'
2020-08-10 14:51:12 -04:00
George Kadianakis
David Goulet
Neel Chauhan
Nick Mathewson
Daniel Pinto