]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agoBump to 0.4.4.6-dev
Nick Mathewson [Thu, 12 Nov 2020 13:13:07 +0000 (08:13 -0500)] 
Bump to 0.4.4.6-dev

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 12 Nov 2020 13:12:20 +0000 (08:12 -0500)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

"ours" to avoid version bump.

5 years agoBump to 0.4.3.7-dev
Nick Mathewson [Thu, 12 Nov 2020 13:12:11 +0000 (08:12 -0500)] 
Bump to 0.4.3.7-dev

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Thu, 12 Nov 2020 13:11:20 +0000 (08:11 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

"ours" to avoid version bump.

5 years agoBump to 0.3.5.12-dev
Nick Mathewson [Thu, 12 Nov 2020 13:11:01 +0000 (08:11 -0500)] 
Bump to 0.3.5.12-dev

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 9 Nov 2020 22:13:41 +0000 (17:13 -0500)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

"-s ours" to avoid version bump.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Mon, 9 Nov 2020 22:13:25 +0000 (17:13 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

"-s ours" to avoid version bump.

5 years agoBump to 0.4.4.6
Nick Mathewson [Mon, 9 Nov 2020 22:13:02 +0000 (17:13 -0500)] 
Bump to 0.4.4.6

5 years agoBump to 0.4.3.7
Nick Mathewson [Mon, 9 Nov 2020 22:12:41 +0000 (17:12 -0500)] 
Bump to 0.4.3.7

5 years agoBump to 0.3.5.12
Nick Mathewson [Mon, 9 Nov 2020 22:12:18 +0000 (17:12 -0500)] 
Bump to 0.3.5.12

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 9 Nov 2020 21:17:42 +0000 (16:17 -0500)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Mon, 9 Nov 2020 21:13:42 +0000 (16:13 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5
Nick Mathewson [Mon, 9 Nov 2020 21:13:24 +0000 (16:13 -0500)] 
Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Alexander Færøy [Wed, 28 Oct 2020 15:39:37 +0000 (15:39 +0000)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Alexander Færøy [Wed, 28 Oct 2020 15:39:37 +0000 (15:39 +0000)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge branch 'tor-gitlab/mr/176' into maint-0.4.4
David Goulet [Tue, 27 Oct 2020 14:18:16 +0000 (10:18 -0400)] 
Merge branch 'tor-gitlab/mr/176' into maint-0.4.4

5 years agoMake ticket40164 compliant with style
Nick Mathewson [Mon, 26 Oct 2020 20:39:24 +0000 (16:39 -0400)] 
Make ticket40164 compliant with style

5 years agoUpdate required/recommended protocol lists more systematically
Nick Mathewson [Fri, 23 Oct 2020 15:23:08 +0000 (11:23 -0400)] 
Update required/recommended protocol lists more systematically

First I began with a set of candidates:

  The client's _required_ list starts with all the protocols
  supported by every release in 0.2.9-stable through current
  master.

  The client's _required_ list starts with all the protocols
  supported by every release in 0.3.5-stable through current
  master.

  Everybody's _recommended_ list starts with all the protocols
  supported by every release in 0.3.5-stable through current master.

Then I removed the protocol versions that we do not actually want to
require or recommend:

  DirCache=1 (deprecated)
  HSDir=1, HSIntro=1-3, HSRend=1 (deprecated)
  (All HS* protocol requirements for clients)
  Link=1-3 (deprecated)
  LinkAuth=1 (obsolete)
  Relay=1 (obsolete)

5 years agoTurn ConsensusParams into a Linelist
Roger Dingledine [Thu, 22 Oct 2020 07:07:09 +0000 (03:07 -0400)] 
Turn ConsensusParams into a Linelist

Make it possible to specify multiple ConsensusParams torrc
lines.

Now directory authority operators can for example put the
main ConsensusParams config in one torrc file and then add to it
from a different torrc file.

Closes ticket 40164.

5 years agoUpdate required/recommended protocol versions.
Nick Mathewson [Sun, 18 Oct 2020 20:09:25 +0000 (16:09 -0400)] 
Update required/recommended protocol versions.

  Cons=1 is the old format of consensuses, without ed25519 keys. It
  is no longer required or recommended.

  Cons=2 is the new format of consensuses, with ed25519 keys. It
  is now required.

  (Similarly for Desc=1,2 and Microdesc=1,2)

No supported client or relay versions should be affected by this
change, since these versions are supported by clients and relays
running 0.2.9 and later.  It will only take effect once enough
authorities vote for it.

Closes ticket 40162.

5 years agoSplit required/recommended protocol lists into multiple lines
Nick Mathewson [Sun, 18 Oct 2020 20:18:42 +0000 (16:18 -0400)] 
Split required/recommended protocol lists into multiple lines

This should make diffs easier to read.

5 years agoImplement proposal 318: Limit protovers to 0..63
Nick Mathewson [Wed, 14 Oct 2020 15:28:37 +0000 (11:28 -0400)] 
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.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Wed, 7 Oct 2020 13:29:17 +0000 (09:29 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 13:29:17 +0000 (09:29 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge remote-tracking branch 'tor-github/pr/1827/head' into maint-0.3.5
Nick Mathewson [Wed, 7 Oct 2020 13:29:07 +0000 (09:29 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1827/head' into maint-0.3.5

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Wed, 7 Oct 2020 12:38:30 +0000 (08:38 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 12:38:30 +0000 (08:38 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agohs-v2: Add deprecation warning for service
David Goulet [Wed, 1 Jul 2020 14:53:30 +0000 (10:53 -0400)] 
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>
5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 12:35:18 +0000 (08:35 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMake HSFETCH take the decoded length into account, not the base32 one
Neel Chauhan [Tue, 16 Jun 2020 21:38:08 +0000 (14:38 -0700)] 
Make HSFETCH take the decoded length into account, not the base32 one

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 12:29:32 +0000 (08:29 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Wed, 7 Oct 2020 12:29:31 +0000 (08:29 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5
Nick Mathewson [Wed, 7 Oct 2020 12:29:23 +0000 (08:29 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 12:26:04 +0000 (08:26 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Wed, 7 Oct 2020 12:26:04 +0000 (08:26 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5
Nick Mathewson [Wed, 7 Oct 2020 12:25:55 +0000 (08:25 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 12:16:19 +0000 (08:16 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Wed, 7 Oct 2020 12:16:19 +0000 (08:16 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5
Nick Mathewson [Wed, 7 Oct 2020 12:14:46 +0000 (08:14 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 12:10:08 +0000 (08:10 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Wed, 7 Oct 2020 12:10:08 +0000 (08:10 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5
Nick Mathewson [Wed, 7 Oct 2020 12:09:59 +0000 (08:09 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 12:08:02 +0000 (08:08 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Wed, 7 Oct 2020 12:08:01 +0000 (08:08 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/137' into maint-0.3.5
Nick Mathewson [Wed, 7 Oct 2020 12:07:53 +0000 (08:07 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/137' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 12:05:40 +0000 (08:05 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Wed, 7 Oct 2020 12:05:40 +0000 (08:05 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/103' into maint-0.3.5
Nick Mathewson [Wed, 7 Oct 2020 12:05:31 +0000 (08:05 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/103' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Wed, 7 Oct 2020 12:02:18 +0000 (08:02 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Wed, 7 Oct 2020 12:01:37 +0000 (08:01 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge branch 'mr_124_squashed' into maint-0.3.5
Nick Mathewson [Wed, 7 Oct 2020 12:00:59 +0000 (08:00 -0400)] 
Merge branch 'mr_124_squashed' into maint-0.3.5

5 years agoParallelize src/test/test into chunks.
Nick Mathewson [Wed, 12 Aug 2020 16:36:54 +0000 (12:36 -0400)] 
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.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/154' into maint-0.4.4
George Kadianakis [Wed, 7 Oct 2020 10:32:17 +0000 (13:32 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/154' into maint-0.4.4

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.4
George Kadianakis [Wed, 7 Oct 2020 10:29:00 +0000 (13:29 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.4

5 years agoMerge branch 'bug40133_035' into bug40133_043
Nick Mathewson [Mon, 28 Sep 2020 14:37:14 +0000 (10:37 -0400)] 
Merge branch 'bug40133_035' into bug40133_043

5 years agoMerge branch 'maint-0.3.5' into bug40133_035
Nick Mathewson [Mon, 28 Sep 2020 14:35:12 +0000 (10:35 -0400)] 
Merge branch 'maint-0.3.5' into bug40133_035

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Tue, 22 Sep 2020 17:47:08 +0000 (13:47 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
David Goulet [Tue, 22 Sep 2020 17:47:08 +0000 (13:47 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agosrv: Remove spammy debug log
David Goulet [Tue, 22 Sep 2020 15:06:34 +0000 (11:06 -0400)] 
srv: Remove spammy debug log

Fixes #40135

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoFix warnings when using two unusual options together.
Nick Mathewson [Tue, 22 Sep 2020 13:59:37 +0000 (09:59 -0400)] 
Fix warnings when using two unusual options together.

The option `--enable-all-bugs-are-fatal` when used with
`--disable-module-relay` caused GCC to warn about functions that
it thought should be labeled noreturn.

I've tried a couple of approaches, but disabling the warning on
these functions seems to be the best approach.

Fixed #40129; bugfix on 0.4.4.1-alpha.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Mon, 21 Sep 2020 16:59:03 +0000 (12:59 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Mon, 21 Sep 2020 16:59:03 +0000 (12:59 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agogitlab-ci: Use test-network-all for debian-integration
Nick Mathewson [Mon, 21 Sep 2020 13:49:29 +0000 (09:49 -0400)] 
gitlab-ci: Use test-network-all for debian-integration

5 years agogitlab-ci: add an NSS check.
Nick Mathewson [Mon, 21 Sep 2020 13:26:57 +0000 (09:26 -0400)] 
gitlab-ci: add an NSS check.

5 years agogitlab-ci: Add all-bugs-are-fatal on hardened and integration builds.
Nick Mathewson [Mon, 21 Sep 2020 13:25:02 +0000 (09:25 -0400)] 
gitlab-ci: Add all-bugs-are-fatal on hardened and integration builds.

5 years agogitlab-ci: Add disable-module builds.
Nick Mathewson [Mon, 21 Sep 2020 13:24:14 +0000 (09:24 -0400)] 
gitlab-ci: Add disable-module builds.

5 years agoAdd a few more options for the CI script.
Nick Mathewson [Mon, 21 Sep 2020 13:20:40 +0000 (09:20 -0400)] 
Add a few more options for the CI script.

These are:
  --disable-module-relay
  --disable-module-dirauth
  --enable-all-bugs-are-fatal
  --enable-nss

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Fri, 18 Sep 2020 23:06:16 +0000 (19:06 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Fri, 18 Sep 2020 23:06:16 +0000 (19:06 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMake debian-trace job conditional on src/lib/trace/trace_sys.c
Nick Mathewson [Fri, 18 Sep 2020 19:56:59 +0000 (15:56 -0400)] 
Make debian-trace job conditional on src/lib/trace/trace_sys.c

5 years ago.gitlab.yml: missing comments
Nick Mathewson [Fri, 18 Sep 2020 19:55:02 +0000 (15:55 -0400)] 
.gitlab.yml: missing comments

5 years agoCopy tracing things back to maint-0.3.5, for consistency.
Nick Mathewson [Fri, 18 Sep 2020 19:53:06 +0000 (15:53 -0400)] 
Copy tracing things back to maint-0.3.5, for consistency.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
David Goulet [Fri, 18 Sep 2020 13:45:25 +0000 (09:45 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
David Goulet [Fri, 18 Sep 2020 13:45:25 +0000 (09:45 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoFix underflow in rend_cache/free_all test.
Nick Mathewson [Thu, 17 Sep 2020 18:04:54 +0000 (14:04 -0400)] 
Fix underflow in rend_cache/free_all test.

We already fixed these in #40099 and #40125.

This patch fixes #40126.  Bugfix on 0.2.8.1-alpha.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.3
Nick Mathewson [Thu, 17 Sep 2020 17:56:40 +0000 (13:56 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 17 Sep 2020 17:56:40 +0000 (13:56 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agotest: Increment rend cache allocation before freeing
David Goulet [Thu, 17 Sep 2020 16:55:40 +0000 (12:55 -0400)] 
test: Increment rend cache allocation before freeing

The rend_cache/entry_free was missing the rend cache allocation increment
before freeing the object.

Without it, it had an underflow bug:

  Sep 17 08:40:13.845 [warn] rend_cache_decrement_allocation(): Bug: Underflow
  in rend_cache_decrement_allocation (on Tor 0.4.5.0-alpha-dev
  7eef9ced61e72b1d)

Fixes #40125

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoBump version to 0.4.4.5-dev.
Nick Mathewson [Tue, 15 Sep 2020 12:52:37 +0000 (08:52 -0400)] 
Bump version to 0.4.4.5-dev.

5 years agoBump version to 0.4.4.5
Nick Mathewson [Mon, 14 Sep 2020 17:17:37 +0000 (13:17 -0400)] 
Bump version to 0.4.4.5

5 years agoResolve a compilation warning in test_connection.c
Nick Mathewson [Mon, 14 Sep 2020 15:50:38 +0000 (11:50 -0400)] 
Resolve a compilation warning in test_connection.c

Instead of casting an enum to a void and back, use a string --
that's better C anyway.

Fixes bug 40113; bugfix on 0.2.9.3-alpha.

5 years agostatistics: Properly count all rendezvous cells (avoid undercounting).
George Kadianakis [Mon, 7 Sep 2020 10:17:41 +0000 (13:17 +0300)] 
statistics: Properly count all rendezvous cells (avoid undercounting).

tl;dr We were not counting cells flying from the client to the service, but we
were counting cells flying from the service to the client.

When a rendezvous cell arrives from the client to the RP, the RP forwards it to
the service.

For this to happen, the cell first passes through command_process_relay_cell()
which normally does the statistics counting. However because the `rend_circ`
circuit was not flagged with `circuit_carries_hs_traffic_stats` in
rend_mid_rendezvous(), the cell is not counted there.

Then the cell goes to circuit_receive_relay_cell() which has a special code
block based on `rend_splice` specifically for rendezvous cells, and the cell
gets directly passed to `rend_circ` via a direct call to
circuit_receive_relay_cell(). The cell never passes through
command_process_relay_cell() ever again and hence is never counted by our
rephist module.

The fix here is to flag the `rend_circ` circuit with
`circuit_carries_hs_traffic_stats` so that the cell is counted as soon as it
hits command_process_relay_cell().

Furthermore we avoid double-counting cells since the special code block of
circuit_receive_relay_cell() makes us count rendezvous cells only as they enter
the RP and not as they exit it.

Fixes #40117.

5 years agoconn: Remove assert on new listener connection when retrying
David Goulet [Tue, 1 Sep 2020 13:54:48 +0000 (09:54 -0400)] 
conn: Remove assert on new listener connection when retrying

Opening a new listener connection can fail in many ways like a bind()
permission denied on a low port for instance.

And thus, we should expect to handle an error when creating a new one instead
of assert() on it.

To hit the removed assert:

  ORPort 80
  KeepBindCapabilities 0

Start tor. Then edit torrc:

  ORPort <some-IP>:80

HUP tor and the assert is hit.

Fixes #40073

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoAvoid guard-related warning when upgrading from 043 to 044.
George Kadianakis [Tue, 25 Aug 2020 12:09:35 +0000 (15:09 +0300)] 
Avoid guard-related warning when upgrading from 043 to 044.

Fixes #40105.

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4
George Kadianakis [Tue, 25 Aug 2020 11:51:05 +0000 (14:51 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/130' into maint-0.4.4

5 years agov3 control: Persist ONION_CLIENT_AUTH_ADD client name
Neel Chauhan [Fri, 7 Aug 2020 05:32:30 +0000 (22:32 -0700)] 
v3 control: Persist ONION_CLIENT_AUTH_ADD client name

5 years agohs: Don't overwrite DoS parameters on circuit with consensus params
David Goulet [Wed, 19 Aug 2020 13:47:34 +0000 (09:47 -0400)] 
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>
5 years agoMerge branch 'mr/124' into maint-0.4.4
George Kadianakis [Wed, 19 Aug 2020 10:55:07 +0000 (13:55 +0300)] 
Merge branch 'mr/124' into maint-0.4.4

5 years agoParallelize src/test/test into chunks.
Nick Mathewson [Wed, 12 Aug 2020 16:36:54 +0000 (12:36 -0400)] 
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.

5 years agoMerge branch 'tor-gitlab/mr/121' into maint-0.4.4
David Goulet [Tue, 18 Aug 2020 12:49:01 +0000 (08:49 -0400)] 
Merge branch 'tor-gitlab/mr/121' into maint-0.4.4

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 13 Aug 2020 18:20:39 +0000 (14:20 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 13 Aug 2020 18:20:39 +0000 (14:20 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2 maint-0.4.2
Nick Mathewson [Thu, 13 Aug 2020 18:20:39 +0000 (14:20 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5
Nick Mathewson [Thu, 13 Aug 2020 18:20:27 +0000 (14:20 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5

5 years agoBump to 0.4.4.4-rc-dev
Nick Mathewson [Thu, 13 Aug 2020 13:43:54 +0000 (09:43 -0400)] 
Bump to 0.4.4.4-rc-dev

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Thu, 13 Aug 2020 00:21:04 +0000 (20:21 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Thu, 13 Aug 2020 00:21:04 +0000 (20:21 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'maint-0.4.3' into maint-0.4.4
Nick Mathewson [Thu, 13 Aug 2020 00:21:04 +0000 (20:21 -0400)] 
Merge branch 'maint-0.4.3' into maint-0.4.4

5 years agoImprove comments in .gitlab-ci.yml
Nick Mathewson [Thu, 13 Aug 2020 00:20:58 +0000 (20:20 -0400)] 
Improve comments in .gitlab-ci.yml

5 years agoCI: Turn on stem with 044 and later.
Nick Mathewson [Thu, 13 Aug 2020 00:13:18 +0000 (20:13 -0400)] 
CI: Turn on stem with 044 and later.