]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agorelay: Set some output arguments in stubs
teor [Fri, 20 Mar 2020 07:10:14 +0000 (17:10 +1000)] 
relay: Set some output arguments in stubs

Fixes part of bug 33674; not in any released version of tor.

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Fri, 20 Mar 2020 12:06:53 +0000 (08:06 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge remote-tracking branch 'tor-github/pr/1824/head'
Nick Mathewson [Fri, 20 Mar 2020 12:06:46 +0000 (08:06 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1824/head'

5 years agoMerge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3
Nick Mathewson [Fri, 20 Mar 2020 12:06:30 +0000 (08:06 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Fri, 20 Mar 2020 11:56:42 +0000 (07:56 -0400)] 
Merge branch 'maint-0.4.3'

5 years agorelay/dirauth: Set some output arguments in stubs
teor [Fri, 20 Mar 2020 07:01:06 +0000 (17:01 +1000)] 
relay/dirauth: Set some output arguments in stubs

And document how some functions set their output arguments.

Fixes bug 33674; bugfix on 0.4.3.1-alpha.

5 years agoSet *have_low_ports_out from stub port_parse_ports_relay().
Nick Mathewson [Fri, 20 Mar 2020 00:04:53 +0000 (20:04 -0400)] 
Set *have_low_ports_out from stub port_parse_ports_relay().

Previously we just ignored this option, which would leave it unset,
and cause an assertion failure later on when running with the User
option.

Fixes bug 33668; bugfix on 0.4.3.1-alpha.

5 years agoMerge branch 'ticket33678_043' into ticket33678_master
teor [Fri, 20 Mar 2020 07:33:56 +0000 (17:33 +1000)] 
Merge branch 'ticket33678_043' into ticket33678_master

Don't take the practracker disable changes from 0.4.3.

5 years agopractracker: Disable practracker in git hooks
teor [Fri, 20 Mar 2020 07:32:57 +0000 (17:32 +1000)] 
practracker: Disable practracker in git hooks

Disable our coding standards best practices tracker in our git hooks.

0.4.3 branches only.

Closes ticket 33678.

5 years agoMerge branch 'maint-0.4.3'
teor [Fri, 20 Mar 2020 05:40:39 +0000 (15:40 +1000)] 
Merge branch 'maint-0.4.3'

5 years agodirauth: Remove a duplicate macro definition
teor [Fri, 20 Mar 2020 05:39:55 +0000 (15:39 +1000)] 
dirauth: Remove a duplicate macro definition

Obviously correct changes to already-reviewed code.

5 years agoMerge branch 'maint-0.4.3'
teor [Fri, 20 Mar 2020 01:25:04 +0000 (11:25 +1000)] 
Merge branch 'maint-0.4.3'

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

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 agoFix erroneous spaces in circuitmux_ewma.c
Neel Chauhan [Thu, 19 Mar 2020 20:06:40 +0000 (13:06 -0700)] 
Fix erroneous spaces in circuitmux_ewma.c

5 years agoMerge branch 'tor-github/pr/1778'
George Kadianakis [Thu, 19 Mar 2020 15:16:00 +0000 (17:16 +0200)] 
Merge branch 'tor-github/pr/1778'

5 years agoRemove changes files that have appeared in 0.4.3.3-alpha
Nick Mathewson [Thu, 19 Mar 2020 12:07:21 +0000 (08:07 -0400)] 
Remove changes files that have appeared in 0.4.3.3-alpha

(findMergedChanges.pl is the tool to do this.)

5 years agoMerge remote-tracking branch 'tor-github/pr/1807/head'
Nick Mathewson [Thu, 19 Mar 2020 12:02:09 +0000 (08:02 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1807/head'

5 years agoMerge branch 'tor-github/pr/1792'
George Kadianakis [Thu, 19 Mar 2020 11:43:49 +0000 (13:43 +0200)] 
Merge branch 'tor-github/pr/1792'

5 years agochanges: Add changes file for ticket 33458
David Goulet [Wed, 18 Mar 2020 14:16:31 +0000 (10:16 -0400)] 
changes: Add changes file for ticket 33458

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agohs-v3: Improve accessor semantic of client cached object
David Goulet [Tue, 10 Mar 2020 14:58:51 +0000 (10:58 -0400)] 
hs-v3: Improve accessor semantic of client cached object

Add an inline helper function that indicates if the cached object contains a
decrypted descriptor or not.

The descriptor object is NULL if tor is unable to decrypt it (lacking client
authorization) and some actions need to be done only when we have a decrypted
object.

This improves code semantic.

Fixes #33458

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'maint-0.4.3'
teor [Thu, 19 Mar 2020 08:03:26 +0000 (18:03 +1000)] 
Merge branch 'maint-0.4.3'

5 years agodoc: Fix a manual page typo
teor [Thu, 19 Mar 2020 08:02:32 +0000 (18:02 +1000)] 
doc: Fix a manual page typo

And consistently talk about extra-info document publishing.

Obviously correct documentation changes.

5 years agocoverity: Silence spurious unreachable warning
teor [Thu, 19 Mar 2020 07:11:13 +0000 (17:11 +1000)] 
coverity: Silence spurious unreachable warning

Closes bug 33641; not in any released version of tor.

5 years agoMerge branch 'maint-0.4.3'
teor [Thu, 19 Mar 2020 07:02:02 +0000 (17:02 +1000)] 
Merge branch 'maint-0.4.3'

5 years agopractracker: Regenerate exceptions file
teor [Thu, 19 Mar 2020 06:59:52 +0000 (16:59 +1000)] 
practracker: Regenerate exceptions file

Accept the current state of the tor codebase, including all the
files and functions that have increased technical debt over the
last few months.

Accepts all the current practracker warnings, so that reviewers
can focus on new warnings.

Closes ticket 33635.

5 years agoMerge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3
teor [Thu, 19 Mar 2020 06:56:49 +0000 (16:56 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3

5 years agofix typo in comment
Roger Dingledine [Thu, 19 Mar 2020 04:41:57 +0000 (00:41 -0400)] 
fix typo in comment

5 years agodoc: Fix a man page typo
teor [Wed, 18 Mar 2020 23:24:15 +0000 (09:24 +1000)] 
doc: Fix a man page typo

Obviously correct changes to already-reviewed code.

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

"ours" to avoid version bump.

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

"ours" to avoid version bump.

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 agoCopy changelogs for today's releases to master.
Nick Mathewson [Wed, 18 Mar 2020 13:06:49 +0000 (09:06 -0400)] 
Copy changelogs for today's releases to master.

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

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

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.3'
Nick Mathewson [Tue, 17 Mar 2020 19:22:36 +0000 (15:22 -0400)] 
Merge branch 'maint-0.4.3'

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

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.3'
Nick Mathewson [Tue, 17 Mar 2020 17:56:10 +0000 (13:56 -0400)] 
Merge branch 'maint-0.4.3'

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

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.3'
Nick Mathewson [Tue, 17 Mar 2020 15:53:24 +0000 (11:53 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoSplit a wide line.
Nick Mathewson [Tue, 17 Mar 2020 15:53:01 +0000 (11:53 -0400)] 
Split a wide line.

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

5 years agoAdd unittest for TROVE-2020-003.
George Kadianakis [Tue, 11 Feb 2020 12:51:58 +0000 (14:51 +0200)] 
Add unittest for TROVE-2020-003.

This unittest currently fails on purpose (to demonstrate the bug) but it will
stop failing after the next commit (the bugfix).

5 years agoMerge branch 'maint-0.4.3'
Nick Mathewson [Tue, 17 Mar 2020 15:47:35 +0000 (11:47 -0400)] 
Merge branch 'maint-0.4.3'

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 agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Tue, 17 Mar 2020 15:45:16 +0000 (11:45 -0400)] 
Merge branch 'maint-0.4.2' into maint-0.4.3

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 agosendme: Emit version 1 by default
David Goulet [Tue, 17 Mar 2020 14:14:57 +0000 (10:14 -0400)] 
sendme: Emit version 1 by default

Closes #33623

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge remote-tracking branch 'tor-github/pr/1784'
teor [Tue, 17 Mar 2020 13:11:31 +0000 (23:11 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1784'

5 years agoRun "practracker.py --regen-overbroad"
teor [Tue, 17 Mar 2020 13:02:16 +0000 (23:02 +1000)] 
Run "practracker.py --regen-overbroad"

We've successfully resolved a bunch of technical debt over the last
few months. Let's remove the allowances for that debt from the
practracker exceptions.

5 years agoMerge branch 'pr1777_squashed'
teor [Tue, 17 Mar 2020 11:08:45 +0000 (21:08 +1000)] 
Merge branch 'pr1777_squashed'

5 years agoConditionally disable part of hs_intropoint/introduce1_validation
rl1987 [Sat, 14 Mar 2020 17:00:54 +0000 (19:00 +0200)] 
Conditionally disable part of hs_intropoint/introduce1_validation

This makes it not fail when ALL_BUGS_ARE_FATAL is enabled. Fixes bug 33546.

5 years agoConditionally disable part of dir/param_voting_lookup that expects soft asserts to...
rl1987 [Sat, 14 Mar 2020 16:51:01 +0000 (18:51 +0200)] 
Conditionally disable part of dir/param_voting_lookup that expects soft asserts to happen

5 years agoTry fixing Windows build to work with ALL_BUGS_ARE_FATAL
rl1987 [Sat, 14 Mar 2020 14:43:08 +0000 (16:43 +0200)] 
Try fixing Windows build to work with ALL_BUGS_ARE_FATAL

5 years agoDocumentation fixups
rl1987 [Sat, 14 Mar 2020 14:25:59 +0000 (16:25 +0200)] 
Documentation fixups

5 years agoUse --enable-all-bugs-are-fatal on hardened Appveyor build
rl1987 [Sat, 14 Mar 2020 14:15:19 +0000 (16:15 +0200)] 
Use --enable-all-bugs-are-fatal on hardened Appveyor build

5 years agoDon't create new CI jobs; use --enable-all-bugs-are-fatal with some of the existing...
rl1987 [Sat, 14 Mar 2020 14:11:00 +0000 (16:11 +0200)] 
Don't create new CI jobs; use --enable-all-bugs-are-fatal with some of the existing jobs

5 years agoAdd --enable-all-bugs-are-fatal option to configure
rl1987 [Fri, 13 Mar 2020 18:24:54 +0000 (20:24 +0200)] 
Add --enable-all-bugs-are-fatal option to configure

This option enables the ALL_BUGS_ARE_FATAL macro.

And use --enable-all-bugs-are-fatal in the Travis configuration.

5 years agoRun "make autostyle"
teor [Tue, 17 Mar 2020 08:19:04 +0000 (18:19 +1000)] 
Run "make autostyle"

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.3'
Nick Mathewson [Mon, 16 Mar 2020 16:21:57 +0000 (12:21 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
Nick Mathewson [Mon, 16 Mar 2020 16:21:49 +0000 (12:21 -0400)] 
Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3

5 years agoAdjust unit tests for patch for 32672 (rejecting old version)
Nick Mathewson [Mon, 16 Mar 2020 14:42:40 +0000 (10:42 -0400)] 
Adjust unit tests for patch for 32672 (rejecting old version)

Patch by Neel Chauhan.

5 years agoMerge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
Nick Mathewson [Mon, 16 Mar 2020 14:40:55 +0000 (10:40 -0400)] 
Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test

5 years agoReject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()
Neel Chauhan [Fri, 6 Dec 2019 00:06:35 +0000 (19:06 -0500)] 
Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()

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

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

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.3'
Nick Mathewson [Fri, 13 Mar 2020 20:57:42 +0000 (16:57 -0400)] 
Merge branch 'maint-0.4.3'

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

"ours" to avoid version bump.

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.