]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agoMerge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
Nick Mathewson [Mon, 29 Jun 2020 17:53:27 +0000 (13:53 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2

5 years agoMerge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
Nick Mathewson [Mon, 29 Jun 2020 17:48:25 +0000 (13:48 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2

5 years agoMerge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2
Nick Mathewson [Mon, 29 Jun 2020 16:58:23 +0000 (12:58 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Mon, 29 Jun 2020 16:55:35 +0000 (12:55 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
Nick Mathewson [Mon, 29 Jun 2020 16:55:27 +0000 (12:55 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
David Goulet [Fri, 12 Jun 2020 16:55:41 +0000 (12:55 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoMerge branch 'tor-github/pr/1912' into maint-0.3.5
David Goulet [Fri, 12 Jun 2020 16:55:17 +0000 (12:55 -0400)] 
Merge branch 'tor-github/pr/1912' into maint-0.3.5

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.2
Nick Mathewson [Fri, 5 Jun 2020 16:37:29 +0000 (12:37 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.2

5 years agoUpdate and upgrade Pacman before installing dependencies in AppVeyor.
Alexander Færøy [Tue, 2 Jun 2020 13:07:54 +0000 (13:07 +0000)] 
Update and upgrade Pacman before installing dependencies in AppVeyor.

This patch makes sures that AppVeyor upgrades its Pacman (the package
manager) before installing the Tor dependencies.

See: https://bugs.torproject.org/34384

5 years agoRevert "Travis: temporarily fix stem version to d1174a83c2dcb7b8"
Nick Mathewson [Wed, 3 Jun 2020 18:48:05 +0000 (14:48 -0400)] 
Revert "Travis: temporarily fix stem version to d1174a83c2dcb7b8"

This reverts commit e63bfca5f2d98788d11b9a0a82bf67277a228c71, now
that Stem has been upgraded to fix the underlying issue.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Fri, 15 May 2020 14:25:27 +0000 (10:25 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1 maint-0.4.1
Nick Mathewson [Fri, 15 May 2020 14:25:27 +0000 (10:25 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoFix use of non-portable == in configure.ac.
Nick Mathewson [Fri, 15 May 2020 13:58:49 +0000 (09:58 -0400)] 
Fix use of non-portable == in configure.ac.

Fixes bug 34233.

(This has bug has been backported to 0.3.5, but only released in
0.4.3, so it only needs a changes file there.)

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Thu, 14 May 2020 14:20:08 +0000 (10:20 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Thu, 14 May 2020 14:20:08 +0000 (10:20 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoTravis: temporarily fix stem version to d1174a83c2dcb7b8
Nick Mathewson [Wed, 13 May 2020 12:53:02 +0000 (08:53 -0400)] 
Travis: temporarily fix stem version to d1174a83c2dcb7b8

This is a workaround for https://github.com/torproject/stem/issues/63

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 6 May 2020 21:07:27 +0000 (17:07 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agobtrack_orconn_cevent.c: Add a missing "break;"
Nick Mathewson [Wed, 6 May 2020 21:07:12 +0000 (17:07 -0400)] 
btrack_orconn_cevent.c: Add a missing "break;"

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 6 May 2020 20:58:12 +0000 (16:58 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 6 May 2020 20:58:12 +0000 (16:58 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agochanges file for bug 34078.
Nick Mathewson [Wed, 6 May 2020 20:58:06 +0000 (16:58 -0400)] 
changes file for bug 34078.

5 years agoUse __attribute__((fallthrough)) rather than magic GCC comments.
Nick Mathewson [Wed, 6 May 2020 14:45:48 +0000 (10:45 -0400)] 
Use __attribute__((fallthrough)) rather than magic GCC comments.

GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.2 version.)

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 6 May 2020 20:53:06 +0000 (16:53 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.

5 years agoUse __attribute__((fallthrough)) rather than magic GCC comments.
Nick Mathewson [Wed, 6 May 2020 14:45:48 +0000 (10:45 -0400)] 
Use __attribute__((fallthrough)) rather than magic GCC comments.

GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.1 version.)

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 6 May 2020 20:51:33 +0000 (16:51 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.

5 years agoUse __attribute__((fallthrough)) rather than magic GCC comments.
Nick Mathewson [Wed, 6 May 2020 14:45:48 +0000 (10:45 -0400)] 
Use __attribute__((fallthrough)) rather than magic GCC comments.

GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that.  Clang recently added
the same thing.

GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments.  Clang, however,
only seems to like "__attribute__((fallthrough))".  Fortunately, GCC
accepts that too.

A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.

This is an automated commit, made with the following perl one-liner:

  #!/usr/bin/perl -i -p
  s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 6 May 2020 20:47:03 +0000 (16:47 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 6 May 2020 20:47:03 +0000 (16:47 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge branch 'bug34078_prelim_041' into maint-0.4.1
Nick Mathewson [Wed, 6 May 2020 20:46:52 +0000 (16:46 -0400)] 
Merge branch 'bug34078_prelim_041' into maint-0.4.1

5 years agoMerge branch 'bug34078_prelim_035' into maint-0.3.5
Nick Mathewson [Wed, 6 May 2020 20:46:31 +0000 (16:46 -0400)] 
Merge branch 'bug34078_prelim_035' into maint-0.3.5

5 years agoMerge branch 'bug34078_prelim_035' into bug34078_prelim_041
Nick Mathewson [Wed, 6 May 2020 19:18:36 +0000 (15:18 -0400)] 
Merge branch 'bug34078_prelim_035' into bug34078_prelim_041

5 years agoRemove an incorrect "Fall through" comment.
Nick Mathewson [Wed, 6 May 2020 18:47:38 +0000 (14:47 -0400)] 
Remove an incorrect "Fall through" comment.

5 years agoaddress.c: add a single (harmless) missing break;
Nick Mathewson [Wed, 6 May 2020 14:42:17 +0000 (10:42 -0400)] 
address.c: add a single (harmless) missing break;

5 years agoinclude compat_compiler for ed25519_donna
Nick Mathewson [Wed, 6 May 2020 14:38:59 +0000 (10:38 -0400)] 
include compat_compiler for ed25519_donna

5 years agoReplace some "fall through" comments not at the end of a case.
Nick Mathewson [Wed, 6 May 2020 14:35:36 +0000 (10:35 -0400)] 
Replace some "fall through" comments not at the end of a case.

5 years agoReplace a "fall through" comment that was outside a switch.
Nick Mathewson [Wed, 6 May 2020 14:32:35 +0000 (10:32 -0400)] 
Replace a "fall through" comment that was outside a switch.

5 years agoAdd a fallthrough macro.
Nick Mathewson [Wed, 6 May 2020 14:24:21 +0000 (10:24 -0400)] 
Add a fallthrough macro.

This macro defers to __attribute__((fallthrough)) on GCC (and
clang).  Previously we had been using GCC's magic /* fallthrough */
comments, but clang very sensibly doesn't accept those.

Since not all compiler recognize it, we only define it when our
configure script detects that it works.

Part of a fix for 34078.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Mon, 4 May 2020 14:25:52 +0000 (10:25 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'bug34077_041' into maint-0.4.1
Nick Mathewson [Mon, 4 May 2020 14:14:38 +0000 (10:14 -0400)] 
Merge branch 'bug34077_041' into maint-0.4.1

5 years agoFix a GCC 10.0.1 compilation warning.
Nick Mathewson [Fri, 1 May 2020 02:56:31 +0000 (22:56 -0400)] 
Fix a GCC 10.0.1 compilation warning.

Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC
first gives this warning for 9eeff921ae7b786d960ea4286d5bba56)

5 years agoremove practracker from check-local (0.4.2 and 0.4.3 only)
Nick Mathewson [Wed, 19 Jun 2019 18:29:08 +0000 (14:29 -0400)] 
remove practracker from check-local (0.4.2 and 0.4.3 only)

practracker shouldn't be running in release or maint branches.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Thu, 9 Apr 2020 01:03:27 +0000 (11:03 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
teor [Thu, 9 Apr 2020 01:03:20 +0000 (11:03 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5
teor [Thu, 9 Apr 2020 01:02:49 +0000 (11:02 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 25 Mar 2020 14:56:27 +0000 (10:56 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'bug33673_035' into bug33673_041
teor [Fri, 20 Mar 2020 04:49:11 +0000 (14:49 +1000)] 
Merge branch 'bug33673_035' into bug33673_041

Merge duplicate DLL copies from maint-0.4.1 with bug33673_035.

5 years agoAppveyor: Copy required DLLs to test and app
teor [Thu, 19 Mar 2020 07:35:49 +0000 (17:35 +1000)] 
Appveyor: Copy required DLLs to test and app

Copy required DLLs to test and app, before running tor's tests.

This ensures that tor.exe and test*.exe use the correct version of each
DLL. This fix is not required, but we hope it will avoid DLL search
issues in future.

Closes bug 33673; bugfix on 0.3.4.2-alpha.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Fri, 20 Mar 2020 01:24:51 +0000 (11:24 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'ticket33643_skip_035' into ticket33643_skip_041
Nick Mathewson [Thu, 19 Mar 2020 22:38:18 +0000 (18:38 -0400)] 
Merge branch 'ticket33643_skip_035' into ticket33643_skip_041

5 years agoAppveyor: disable crypto/openssl_version
Nick Mathewson [Thu, 19 Mar 2020 19:28:55 +0000 (15:28 -0400)] 
Appveyor: disable crypto/openssl_version

5 years agoAdd a TOR_SKIP_TESTCASES environment variable for suppressing tests.
Nick Mathewson [Thu, 19 Mar 2020 19:25:11 +0000 (15:25 -0400)] 
Add a TOR_SKIP_TESTCASES environment variable for suppressing tests.

For example, "TOR_SKIP_TESTCASES=crypto/.. ./src/test/test" will run
the tests and suppress all the "crypto/" tests.  You could get the
same effect by running "./src/test/test :crypto/..", but that can be
harder to arrange from CI.

Part of a fix/workaround for 33643.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 18 Mar 2020 16:17:11 +0000 (12:17 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 18 Mar 2020 16:16:59 +0000 (12:16 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.

5 years agoBump version to 0.4.2.7-dev
Nick Mathewson [Wed, 18 Mar 2020 16:16:11 +0000 (12:16 -0400)] 
Bump version to 0.4.2.7-dev

5 years agoBump version to 0.4.1.9-dev
Nick Mathewson [Wed, 18 Mar 2020 16:15:53 +0000 (12:15 -0400)] 
Bump version to 0.4.1.9-dev

5 years agoBump version to 0.3.5.10-dev
Nick Mathewson [Wed, 18 Mar 2020 16:15:32 +0000 (12:15 -0400)] 
Bump version to 0.3.5.10-dev

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Wed, 18 Mar 2020 12:20:16 +0000 (08:20 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoPort rsa_private_key_too_long() to work on OpenSSL 1.1.0.
Nick Mathewson [Wed, 18 Mar 2020 12:19:48 +0000 (08:19 -0400)] 
Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge branch 'trove_2020_002_041' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 19:22:02 +0000 (15:22 -0400)] 
Merge branch 'trove_2020_002_041' into maint-0.4.1

5 years agoMerge branch 'trove_2020_002_035' into maint-0.3.5
Nick Mathewson [Tue, 17 Mar 2020 19:21:48 +0000 (15:21 -0400)] 
Merge branch 'trove_2020_002_035' into maint-0.3.5

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 17 Mar 2020 17:56:10 +0000 (13:56 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'trove_2020_004_041_v2' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 17:56:03 +0000 (13:56 -0400)] 
Merge branch 'trove_2020_004_041_v2' into maint-0.4.1

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Tue, 17 Mar 2020 15:45:16 +0000 (11:45 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Tue, 17 Mar 2020 15:45:16 +0000 (11:45 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoFix TROVE-2020-003.
George Kadianakis [Tue, 11 Feb 2020 16:37:55 +0000 (18:37 +0200)] 
Fix TROVE-2020-003.

Given that ed25519 public key validity checks are usually not needed
and (so far) they are only necessary for onion addesses in the Tor
protocol, we decided to fix this specific bug instance without
modifying the rest of the codebase (see below for other fix
approaches).

In our minimal fix we check that the pubkey in
hs_service_add_ephemeral() is valid and error out otherwise.

5 years agoTrivial bugfixes found during TROVE investigation.
George Kadianakis [Mon, 10 Feb 2020 14:35:40 +0000 (16:35 +0200)] 
Trivial bugfixes found during TROVE investigation.

5 years agoMerge branch 'trove_2020_002_035' into trove_2020_002_041
Nick Mathewson [Tue, 17 Mar 2020 14:45:03 +0000 (10:45 -0400)] 
Merge branch 'trove_2020_002_035' into trove_2020_002_041

5 years agoUse >= consistently with max_bits.
Nick Mathewson [Tue, 17 Mar 2020 14:09:58 +0000 (10:09 -0400)] 
Use >= consistently with max_bits.

5 years agoAdd off-by-one checks for key length.
Nick Mathewson [Tue, 17 Mar 2020 14:07:54 +0000 (10:07 -0400)] 
Add off-by-one checks for key length.

5 years agoExtract key length check into a new function, and check more fields.
Nick Mathewson [Tue, 17 Mar 2020 14:04:38 +0000 (10:04 -0400)] 
Extract key length check into a new function, and check more fields.

In the openssl that I have, it should be safe to only check the size
of n.  But if I'm wrong, or if other openssls work differently, we
should check whether any of the fields are too large.

Issue spotted by Teor.

5 years agocircpad_setup_machine_on_circ(): exit early on error.
Nick Mathewson [Sat, 14 Mar 2020 18:44:33 +0000 (14:44 -0400)] 
circpad_setup_machine_on_circ(): exit early on error.

This function does a nonfatal assertion to make sure that a machine
is not registered twice, but Tobias Pulls found a case where it
happens.  Instead, make the function exit early so that it doesn't
cause a remotely triggered memory leak.

Fixes bug 33619; bugfix on 0.4.0.1-alpha.  This is also tracked as
TROVE-2020-004.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Mon, 16 Mar 2020 10:54:27 +0000 (20:54 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
teor [Mon, 16 Mar 2020 10:54:20 +0000 (20:54 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoTravis: Produce detailed chutney diagnostics
teor [Mon, 17 Feb 2020 07:21:13 +0000 (17:21 +1000)] 
Travis: Produce detailed chutney diagnostics

When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.

Closes ticket 32792.

5 years agoMerge branch 'trove_2020_002_035' into trove_2020_002_041
Nick Mathewson [Sat, 14 Mar 2020 18:20:51 +0000 (14:20 -0400)] 
Merge branch 'trove_2020_002_035' into trove_2020_002_041

5 years agoFix memory leak in crypto_pk_asn1_decode_private.
Nick Mathewson [Sat, 14 Mar 2020 18:17:33 +0000 (14:17 -0400)] 
Fix memory leak in crypto_pk_asn1_decode_private.

(Deep, deep thanks to Taylor for reminding me to test this!)

5 years agoAdd a test for crypto_pk_asn1_decode_private maxbits.
Nick Mathewson [Sat, 14 Mar 2020 17:50:38 +0000 (13:50 -0400)] 
Add a test for crypto_pk_asn1_decode_private maxbits.

5 years agoRevise TROVE-2020-002 fix to work on older OpenSSL versions.
Nick Mathewson [Sat, 14 Mar 2020 17:38:53 +0000 (13:38 -0400)] 
Revise TROVE-2020-002 fix to work on older OpenSSL versions.

Although OpenSSL before 1.1.1 is no longer supported, it's possible
that somebody is still using it with 0.3.5, so we probably shouldn't
break it with this fix.

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Fri, 13 Mar 2020 20:57:03 +0000 (16:57 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Fri, 13 Mar 2020 20:56:44 +0000 (16:56 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.

5 years agoBump to 0.3.5.10
Nick Mathewson [Fri, 13 Mar 2020 20:56:31 +0000 (16:56 -0400)] 
Bump to 0.3.5.10

5 years agoBump to 0.4.1.9
Nick Mathewson [Fri, 13 Mar 2020 20:56:22 +0000 (16:56 -0400)] 
Bump to 0.4.1.9

5 years agoBump to 0.4.2.7.
Nick Mathewson [Fri, 13 Mar 2020 20:56:06 +0000 (16:56 -0400)] 
Bump to 0.4.2.7.

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
Nick Mathewson [Fri, 13 Mar 2020 20:46:16 +0000 (16:46 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.1

5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
Nick Mathewson [Fri, 13 Mar 2020 20:46:16 +0000 (16:46 -0400)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
Nick Mathewson [Fri, 13 Mar 2020 20:46:09 +0000 (16:46 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5

5 years agoMerge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2
Nick Mathewson [Fri, 13 Mar 2020 20:42:47 +0000 (16:42 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2

5 years agodos: Pass transport name on new client connection
David Goulet [Tue, 10 Mar 2020 18:45:13 +0000 (14:45 -0400)] 
dos: Pass transport name on new client connection

For a bridge configured with a pluggable transport, the transport name is
used, with the IP address, for the GeoIP client cache entry.

However, the DoS subsystem was not aware of it and always passing NULL when
doing a lookup into the GeoIP cache.

This resulted in bridges with a PT are never able to apply DoS defenses for
newly created connections.

Fixes #33491

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'bug33195_041' into bug33195_042
teor [Thu, 13 Feb 2020 03:58:13 +0000 (13:58 +1000)] 
Merge branch 'bug33195_041' into bug33195_042

Conflicts:
* Keep RUST_VERSION from maint-0.4.2
* Keep the commented-out allow_failure entries from bug33195_041

5 years agoMerge branch 'bug33195_035' into bug33195_041
teor [Thu, 13 Feb 2020 03:55:55 +0000 (13:55 +1000)] 
Merge branch 'bug33195_035' into bug33195_041

Conflicts:
* Keep TOR_TEST_RNG_SEED from maint-0.4.1
* Keep the ordering from bug33195_035

5 years agoTravis: Sort jobs in order of speed
teor [Thu, 13 Feb 2020 03:37:02 +0000 (13:37 +1000)] 
Travis: Sort jobs in order of speed

Putting the slowest jobs first takes full advantage of Travis
concurrency.

Closes 33194.

5 years agoTravis: Remove a redundant distcheck job
teor [Thu, 13 Feb 2020 03:22:19 +0000 (13:22 +1000)] 
Travis: Remove a redundant distcheck job

Part of 33194.

5 years agoTravis: Require the macOS IPv6 chutney job
teor [Thu, 13 Feb 2020 03:13:40 +0000 (13:13 +1000)] 
Travis: Require the macOS IPv6 chutney job

The job was previously set to fast_finish / allow_failure, to
speed up the build.

Closes ticket 33195.

5 years agoerr/log: Stop closing stderr and stdout during shutdown
teor [Wed, 12 Feb 2020 02:47:15 +0000 (12:47 +1000)] 
err/log: Stop closing stderr and stdout during shutdown

Closing these file descriptors can hide sanitiser logs.

Fixes bug 33087; bugfix on 0.4.1.6.

5 years agohs-v3: Remove BUG() that can occur normally
David Goulet [Tue, 4 Feb 2020 15:13:10 +0000 (10:13 -0500)] 
hs-v3: Remove BUG() that can occur normally

Fixes #28992

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Wed, 12 Feb 2020 02:22:04 +0000 (12:22 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

5 years agoMerge branch 'maint-0.3.5' into maint-0.4.1
teor [Wed, 12 Feb 2020 02:21:57 +0000 (12:21 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.1