]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
5 years agoMerge branch 'maint-0.4.3'
David Goulet [Mon, 30 Mar 2020 17:38:58 +0000 (13:38 -0400)] 
Merge branch 'maint-0.4.3'

5 years agohs-v3: Relax severity of a log message when decoding descriptors.
George Kadianakis [Wed, 11 Mar 2020 13:18:47 +0000 (15:18 +0200)] 
hs-v3: Relax severity of a log message when decoding descriptors.

Make it LOG_PROTOCOL_WARN and also add the expiration timestamp in there to
ease debugging in the future.

5 years agochanges: Add file for ticket 33014
David Goulet [Mon, 30 Mar 2020 17:36:54 +0000 (13:36 -0400)] 
changes: Add file for ticket 33014

Signed-off-by: David Goulet <dgoulet@torproject.org>
5 years agoMerge branch 'tor-github/pr/1775'
David Goulet [Mon, 30 Mar 2020 17:31:56 +0000 (13:31 -0400)] 
Merge branch 'tor-github/pr/1775'

5 years agoUse a macro to make our hs_opts checking terser.
Nick Mathewson [Sun, 8 Mar 2020 19:49:40 +0000 (15:49 -0400)] 
Use a macro to make our hs_opts checking terser.

5 years agoUse SECTION_HEADER, not "HiddenServiceDir".
Nick Mathewson [Sat, 7 Mar 2020 14:32:54 +0000 (09:32 -0500)] 
Use SECTION_HEADER, not "HiddenServiceDir".

Add a nonfatal assertion about a branch that should be unreachable.

5 years agoUpdate expected log messages in tests to new format.
Nick Mathewson [Thu, 5 Mar 2020 15:28:06 +0000 (10:28 -0500)] 
Update expected log messages in tests to new format.

5 years agoDerive hidden service configuration from hs_opts_t.
Nick Mathewson [Fri, 28 Feb 2020 13:46:18 +0000 (08:46 -0500)] 
Derive hidden service configuration from hs_opts_t.

This simplifies our parsing code by about 150 lines, and makes the
functions more straightforward.

5 years agoStart using confmgt logic to parse HS configuration.
Nick Mathewson [Tue, 21 Jan 2020 15:23:27 +0000 (10:23 -0500)] 
Start using confmgt logic to parse HS configuration.

This patch doesn't actually use the results of the parsed object to
create the service configuration: subsequent patches will do
that. This patch just introduces the necessary configuration tables
and starts using them to validate the configuration.

As of this writing, this patch breaks tests.  I'll likely fix that
in a rebase later on: the current error messages for failures to
parse options are a regression, so I've opened #33640 for that.

5 years agoUse config_lines_partition() to parse hs config sections.
Nick Mathewson [Wed, 26 Feb 2020 15:12:54 +0000 (10:12 -0500)] 
Use config_lines_partition() to parse hs config sections.

5 years agoPut *.a wildcard entry into .gitignore instead of listing all .a files
rl1987 [Sat, 28 Mar 2020 12:01:07 +0000 (14:01 +0200)] 
Put *.a wildcard entry into .gitignore instead of listing all .a files

5 years agoMerge remote-tracking branch 'tor-github/pr/1832/head'
Nick Mathewson [Fri, 27 Mar 2020 13:15:29 +0000 (09:15 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1832/head'

5 years agofix typo in struct addr_policy_t comment
Roger Dingledine [Fri, 27 Mar 2020 07:48:15 +0000 (03:48 -0400)] 
fix typo in struct addr_policy_t comment

5 years agocorrect tor_addr_family() function comment
Roger Dingledine [Fri, 27 Mar 2020 07:46:54 +0000 (03:46 -0400)] 
correct tor_addr_family() function comment

kind of a losing game to remember to update that comment when
we add another possible family, but hey, maybe it will be a while
until we add one more.

5 years agospell consensus more right in comments
Roger Dingledine [Fri, 27 Mar 2020 06:56:59 +0000 (02:56 -0400)] 
spell consensus more right in comments

5 years agofix typo in log message
Roger Dingledine [Fri, 27 Mar 2020 06:51:01 +0000 (02:51 -0400)] 
fix typo in log message

5 years agodoc: Remove TODO secion in README.1st.md
Bartosz Duszel [Thu, 26 Mar 2020 15:32:13 +0000 (16:32 +0100)] 
doc: Remove TODO secion in README.1st.md

It seems like this section is not valid anymore.
Most of this topics are already explained in different
files.

5 years agodoc: Replace "underline" with "## Section name".
Bartosz Duszel [Thu, 26 Mar 2020 15:19:42 +0000 (16:19 +0100)] 
doc: Replace "underline" with "## Section name".

This approach doesn't require variable-length underlines.

5 years agodoc: Remove first, empty line in the file.
Bartosz Duszel [Thu, 26 Mar 2020 14:59:17 +0000 (15:59 +0100)] 
doc: Remove first, empty line in the file.

5 years agodoc: Updates paths to the top of the source tree.
Bartosz Duszel [Thu, 26 Mar 2020 14:54:29 +0000 (15:54 +0100)] 
doc: Updates paths to the top of the source tree.

Example:
.../doc/HACKING is now doc/HACKING

5 years agoMerge remote-tracking branch 'tor-github/pr/1780/head'
Nick Mathewson [Thu, 26 Mar 2020 14:38:08 +0000 (10:38 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1780/head'

5 years agoMerge branch 'maint-0.4.3'
David Goulet [Thu, 26 Mar 2020 13:15:01 +0000 (09:15 -0400)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'tor-github/pr/1794' into maint-0.4.3
David Goulet [Thu, 26 Mar 2020 13:14:25 +0000 (09:14 -0400)] 
Merge branch 'tor-github/pr/1794' into maint-0.4.3

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

5 years agoMerge branch 'maint-0.4.2' into maint-0.4.3
Nick Mathewson [Wed, 25 Mar 2020 14:56:27 +0000 (10: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 [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 'bug33651'
Nick Mathewson [Wed, 25 Mar 2020 14:38:01 +0000 (10:38 -0400)] 
Merge branch 'bug33651'

5 years agoMerge branch 'tor-github/pr/1789'
George Kadianakis [Mon, 23 Mar 2020 14:57:49 +0000 (16:57 +0200)] 
Merge branch 'tor-github/pr/1789'

5 years agoMerge branch 'maint-0.4.3'
George Kadianakis [Mon, 23 Mar 2020 14:57:27 +0000 (16:57 +0200)] 
Merge branch 'maint-0.4.3'

5 years agoMerge branch 'tor-github/pr/1788' into maint-0.4.3
George Kadianakis [Mon, 23 Mar 2020 14:56:59 +0000 (16:56 +0200)] 
Merge branch 'tor-github/pr/1788' into maint-0.4.3

5 years agoMerge remote-tracking branch 'tor-github/pr/1797/head'
Nick Mathewson [Mon, 23 Mar 2020 13:05:45 +0000 (09:05 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1797/head'

5 years agoUpdate README files with common style.
Bartosz Duszel [Sun, 22 Mar 2020 12:50:58 +0000 (13:50 +0100)] 
Update README files with common style.

- external links use markdown's []() format,
- local files are formated with backquotes,
- duplicated new lines were removed,
- unnecesary single spaces were removed,
- broken links and local paths were updated.

5 years agopractracker: Accept changes
teor [Fri, 20 Mar 2020 18:10:24 +0000 (04:10 +1000)] 
practracker: Accept changes

Accept a smaller file and function.
Let router.c grow slightly without warning.
Accept an extra comment line.

Cleanup after 32588.

5 years agoAdd some comments about future relay IPv6 work
teor [Fri, 20 Mar 2020 17:42:07 +0000 (03:42 +1000)] 
Add some comments about future relay IPv6 work

Comments about 33681.

5 years agoparseconf: Add ORPort and DirPort auto tests
teor [Tue, 14 Jan 2020 11:49:29 +0000 (21:49 +1000)] 
parseconf: Add ORPort and DirPort auto tests

These tests don't actually trigger bug 32588, but they do increase
the coverage of the auto port config code.

Tests for 32588.

5 years agoMerge branch 'bug32588_043' into bug32588_master
teor [Fri, 20 Mar 2020 18:02:08 +0000 (04:02 +1000)] 
Merge branch 'bug32588_043' into bug32588_master

5 years agoMerge branch 'bug32588_042' into bug32588_043
teor [Fri, 20 Mar 2020 18:01:00 +0000 (04:01 +1000)] 
Merge branch 'bug32588_042' into bug32588_043

Merge static function declaration deletions from bug32588_042 and
maint-0.4.3 in app/config/config.c.

5 years agoMerge branch 'bug32588_041' into bug32588_042
teor [Fri, 20 Mar 2020 17:52:32 +0000 (03:52 +1000)] 
Merge branch 'bug32588_041' into bug32588_042

5 years agoMerge branch 'bug32588_035' into bug32588_041
teor [Fri, 20 Mar 2020 17:50:36 +0000 (03:50 +1000)] 
Merge branch 'bug32588_035' into bug32588_041

Merge tests from maint-0.4.1 with new tests from bug32588_035
in test_router.c.

5 years agoAdd a test for the localhost case.
Nick Mathewson [Thu, 19 Mar 2020 13:50:36 +0000 (09:50 -0400)] 
Add a test for the localhost case.

5 years agoExtend test to handle router_get_advertised_ipv6_or_ap
Nick Mathewson [Thu, 19 Mar 2020 13:44:27 +0000 (09:44 -0400)] 
Extend test to handle router_get_advertised_ipv6_or_ap

5 years agoAdd a test for router_get_advertised_or_port_by_af().
Nick Mathewson [Thu, 19 Mar 2020 13:36:47 +0000 (09:36 -0400)] 
Add a test for router_get_advertised_or_port_by_af().

5 years agoAdd tests for get_first_advertised_{addr,port}_by_type_af()
Nick Mathewson [Thu, 19 Mar 2020 13:17:09 +0000 (09:17 -0400)] 
Add tests for get_first_advertised_{addr,port}_by_type_af()

5 years agorouter: Refactor IPv6 ORPort function logic
teor [Wed, 8 Jan 2020 07:34:37 +0000 (17:34 +1000)] 
router: Refactor IPv6 ORPort function logic

Return early when there is no suitable IPv6 ORPort.
Show the address and port on error, using a convenience function.

Code simplification and refactoring.

Cleanup after 32588.

5 years agorouter: Stop advertising incorrect auto IPv6 ORPorts
teor [Fri, 20 Dec 2019 04:30:51 +0000 (14:30 +1000)] 
router: Stop advertising incorrect auto IPv6 ORPorts

When IPv6 ORPorts are set to "auto", tor relays and bridges would
advertise an incorrect port in their descriptor.

This may be a low-severity memory safety issue, because the published
port number may be derived from uninitialised or out-of-bounds memory
reads.

Fixes bug 32588; bugfix on 0.2.3.9-alpha.

5 years agopractracker: Accept larger dirvote file
teor [Fri, 20 Mar 2020 07:17:11 +0000 (17:17 +1000)] 
practracker: Accept larger dirvote file

Due to improved function comments.

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 '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.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 agoActually log post-bootstrap directory dl totals.
Nick Mathewson [Thu, 19 Mar 2020 12:08:58 +0000 (08:08 -0400)] 
Actually log post-bootstrap directory dl totals.

Fixes bug 33651; bug not in any released Tor.

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