torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,929 Commits 53 Branches 631 Tags
822585cf3f1fbc3d9ee75ef52cb7443bb5bb6399
Commit Graph

35929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 822585cf3f Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 09:29:17 -04:00
Nick Mathewson ef70f5f42a Merge branch 'maint-0.4.3' into maint-0.4.4 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 15c93cba3b Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 08:38:30 -04:00
Nick Mathewson 96b69152ce Merge branch 'maint-0.4.3' into maint-0.4.4 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 fc563a6668 Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 08:35:18 -04:00
Nick Mathewson 0e2e517019 Merge branch 'maint-0.4.3' into maint-0.4.4 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 e3ba769271 Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 08:29:32 -04:00
Nick Mathewson faac186075 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-10-07 08:29:32 -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 571253e7ac Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 08:26:04 -04:00
Nick Mathewson ad62cf2ac9 Merge branch 'maint-0.4.3' into maint-0.4.4 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 361a4425cf Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 08:16:20 -04:00
Nick Mathewson a44bcc309d Merge branch 'maint-0.4.3' into maint-0.4.4 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 d455b68909 Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 08:10:08 -04:00
Nick Mathewson c65f4eaf06 Merge branch 'maint-0.4.3' into maint-0.4.4 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 50cb7a5254 Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 08:08:02 -04:00
Nick Mathewson 8505dd5e37 Merge branch 'maint-0.4.3' into maint-0.4.4 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 ad3cb51b9f Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 08:05:40 -04:00
Nick Mathewson 30c6b42d34 Merge branch 'maint-0.4.3' into maint-0.4.4 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 128dc38909 Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 08:03:52 -04:00
Nick Mathewson 7097d1bab9 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-10-07 08:02:18 -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
George Kadianakis 7d512cd8b3 Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 13:42:57 +03:00
George Kadianakis a914ac5d7c Merge remote-tracking branch 'tor-gitlab/mr/154' into maint-0.4.4 2020-10-07 13:32:17 +03:00
George Kadianakis 9c31a8fde3 Merge branch 'maint-0.4.4' into release-0.4.4 2020-10-07 13:29:16 +03:00
George Kadianakis 149b7a2418 Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.4 2020-10-07 13:29:00 +03:00
Nick Mathewson f5ddc45647 Merge branch 'bug40133_035' into bug40133_043 2020-09-28 10:37:14 -04:00
Nick Mathewson 79d7773968 Merge branch 'maint-0.3.5' into bug40133_035 2020-09-28 10:35:12 -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 1ebea31036 Merge branch 'maint-0.4.4' into release-0.4.4 2020-09-22 13:47:08 -04:00
David Goulet b6429430c6 Merge branch 'maint-0.4.3' into maint-0.4.4 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