Nick Mathewson
be356d80fe
Correct EOL date for 0.4.3.x
2020-11-12 09:42:47 -05:00
Nick Mathewson
ded1695a66
Merge branch 'maint-0.4.3' into release-0.4.3
2020-11-12 08:13:37 -05:00
Nick Mathewson
fd22fa183b
Bump to 0.4.3.7-dev
2020-11-12 08:12:11 -05:00
Nick Mathewson
1fa90a2077
Merge branch 'maint-0.3.5' into maint-0.4.3
...
"ours" to avoid version bump.
2020-11-12 08:11:20 -05:00
Nick Mathewson
862c44e4ec
Bump to 0.3.5.12-dev
2020-11-12 08:11:01 -05:00
Nick Mathewson
26465179fa
Copy 0.4.3.7 changelog to releasenotes
2020-11-12 07:35:53 -05:00
Nick Mathewson
c142045be2
Merge branch 'maint-0.4.3' into release-0.4.3
2020-11-09 17:14:58 -05:00
Nick Mathewson
3d3dc08ed8
Merge branch 'maint-0.3.5' into maint-0.4.3
...
"-s ours" to avoid version bump.
2020-11-09 17:13:25 -05:00
Nick Mathewson
6338c35e9d
Bump to 0.4.3.7
2020-11-09 17:12:41 -05:00
Nick Mathewson
665083be9f
Bump to 0.3.5.12
2020-11-09 17:12:18 -05:00
Nick Mathewson
328078c3a0
changelog for 0.4.3.7
2020-11-09 16:58:18 -05:00
Nick Mathewson
4234a9d819
Merge branch 'maint-0.4.3' into release-0.4.3
2020-11-09 16:13:43 -05:00
Nick Mathewson
0b2c64effd
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-11-09 16:13:42 -05:00
Nick Mathewson
52e439c13e
Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5
2020-11-09 16:13:24 -05:00
Alexander Færøy
2ec66e346b
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-28 15:39:37 +00:00
Alexander Færøy
4876409c2a
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-28 15:39:37 +00:00
Nick Mathewson
dd63b97288
Implement proposal 318: Limit protovers to 0..63
...
In brief: we go through a lot of gymnastics to handle huge protover
numbers, but after years of development we're not even close to 10
for any of our current versions. We also have a convenient
workaround available in case we ever run out of protocols: if (for
example) we someday need Link=64, we can just add Link2=0 or
something.
This patch is a minimal patch to change tor's behavior; it doesn't
take advantage of the new restrictions.
Implements #40133 and proposal 318.
2020-10-14 11:28:37 -04:00
Nick Mathewson
497033b05f
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 09:29:17 -04:00
Nick Mathewson
8e7778ec8a
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 09:29:17 -04:00
Nick Mathewson
741edf1b45
Merge remote-tracking branch 'tor-github/pr/1827/head' into maint-0.3.5
2020-10-07 09:29:07 -04:00
Nick Mathewson
ddd3e7d094
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:38:30 -04:00
Nick Mathewson
40f0db75bd
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:38:30 -04:00
David Goulet
b404f085ad
hs-v2: Add deprecation warning for service
...
If at least one service is configured as a version 2, a log warning is emitted
once and only once.
Closes #40003
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-10-07 08:38:23 -04:00
Nick Mathewson
df3e5e1cb0
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:35:18 -04:00
Neel Chauhan
884cad3edf
Make HSFETCH take the decoded length into account, not the base32 one
2020-10-07 08:35:12 -04:00
Nick Mathewson
bfa8f3f93a
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:29:31 -04:00
Nick Mathewson
3e9fa5a029
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:29:31 -04:00
Nick Mathewson
5f5587ee50
Merge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5
2020-10-07 08:29:23 -04:00
Nick Mathewson
bef4760055
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:26:04 -04:00
Nick Mathewson
701a1936fa
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:26:04 -04:00
Nick Mathewson
ad7ffa5240
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5
2020-10-07 08:25:55 -04:00
Nick Mathewson
225d255fdc
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:16:19 -04:00
Nick Mathewson
a49373844c
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:16:19 -04:00
Nick Mathewson
98e14720b5
Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5
2020-10-07 08:14:46 -04:00
Nick Mathewson
02f8852386
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:10:08 -04:00
Nick Mathewson
9587512578
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:10:08 -04:00
Nick Mathewson
968b6c30c1
Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5
2020-10-07 08:09:59 -04:00
Nick Mathewson
e60d62e50d
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:08:02 -04:00
Nick Mathewson
9029444482
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:08:01 -04:00
Nick Mathewson
e0e0ef713e
Merge remote-tracking branch 'tor-gitlab/mr/137' into maint-0.3.5
2020-10-07 08:07:53 -04:00
Nick Mathewson
6b828ced0f
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:05:40 -04:00
Nick Mathewson
8a561fc5bf
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:05:40 -04:00
Nick Mathewson
84a5bd48e2
Merge remote-tracking branch 'tor-gitlab/mr/103' into maint-0.3.5
2020-10-07 08:05:31 -04:00
Nick Mathewson
8ac1f8663b
Merge branch 'maint-0.4.3' into release-0.4.3
2020-10-07 08:03:52 -04:00
Nick Mathewson
b5a88e8d47
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-07 08:01:37 -04:00
Nick Mathewson
ed6a328297
Merge branch 'mr_124_squashed' into maint-0.3.5
2020-10-07 08:00:59 -04:00
Nick Mathewson
c5ba8b6221
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-10-07 08:00:49 -04:00
David Goulet
c374d49381
Merge branch 'maint-0.4.3' into release-0.4.3
2020-09-22 13:47:08 -04:00
David Goulet
beffad8529
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-09-22 13:47:08 -04:00
David Goulet
faf89ec6c2
srv: Remove spammy debug log
...
Fixes #40135
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-09-22 11:06:34 -04:00
