]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
6 years agopractracker: replaces "overstrict" with "overbroad"
Nick Mathewson [Thu, 1 Aug 2019 13:35:33 +0000 (09:35 -0400)] 
practracker: replaces "overstrict" with "overbroad"

I had the logic reversed here.

6 years agoLower check of TOR_DISABLE_PRACTRACKER
Nick Mathewson [Thu, 1 Aug 2019 12:40:56 +0000 (08:40 -0400)] 
Lower check of TOR_DISABLE_PRACTRACKER

Since we sometimes call practracker directly, that's where we should
check the TOR_DISABLE_PRACTRACKER envvar.

6 years agoPractracker: add an integration test.
Nick Mathewson [Tue, 30 Jul 2019 16:07:40 +0000 (12:07 -0400)] 
Practracker: add an integration test.

This test runs practracker with a set of 0 thresholds, to make sure
that it enumerates all its values right.  It tries running with an
empty exceptions file, and with an exceptions file that covers
_some_ of the data, and it makes sure that the outputs are as expected.

6 years agopractracker: better warning/regen handling
Nick Mathewson [Tue, 30 Jul 2019 15:54:05 +0000 (11:54 -0400)] 
practracker: better warning/regen handling

Now that there is only one toplevel place where we print problems,
we can redirect just that one print to a file when we are
regenerating the exceptions.txt file.  Previously we redirected
sys.stdout, which is naughty, and forced us to send warnings (and
warnings alone) to stderr.

6 years agoPractracker: new flags to control output.
Nick Mathewson [Tue, 30 Jul 2019 15:49:50 +0000 (11:49 -0400)] 
Practracker: new flags to control output.

These flags let you suppress the message about the number of
problems and warnings, and let you control the thresholds above
which something counts as a problem.

I need this for testing.

6 years agopractracker: Remove problemvault global.
Nick Mathewson [Tue, 30 Jul 2019 14:17:19 +0000 (10:17 -0400)] 
practracker: Remove problemvault global.

6 years agopractracker: Move the warning/error distinction to a higher level.
Nick Mathewson [Tue, 30 Jul 2019 14:15:11 +0000 (10:15 -0400)] 
practracker: Move the warning/error distinction to a higher level.

Previously warnings were generated by magic inside ProblemVault; now
they're printed on demand.

6 years agopractracker: Refactor flow to use generators
Nick Mathewson [Tue, 30 Jul 2019 13:20:08 +0000 (09:20 -0400)] 
practracker: Refactor flow to use generators

Instead of having "consider" functions that have to call a global
ProblemVault, we can now generate all the metrics for the code
separately from the decision about what to do for them.

6 years agopractracker: Rename "Problem" to "Item".
Nick Mathewson [Tue, 30 Jul 2019 13:03:55 +0000 (09:03 -0400)] 
practracker: Rename "Problem" to "Item".

I'm about to refactor the code into a set of iterators that yield
*all* the metrics for the code, and then add a filter on top of that
to return the problems.

6 years agochanges file for 30752
Nick Mathewson [Thu, 18 Jul 2019 13:27:58 +0000 (09:27 -0400)] 
changes file for 30752

6 years agoAdd a TOR_DISABLE_PRACTRACKER envvar for use by folks who don't care
Nick Mathewson [Wed, 17 Jul 2019 13:28:48 +0000 (15:28 +0200)] 
Add a TOR_DISABLE_PRACTRACKER envvar for use by folks who don't care

Fixes part of bug 30752

6 years agoPractracker: add tolerances for exceptions
Nick Mathewson [Wed, 17 Jul 2019 13:20:58 +0000 (15:20 +0200)] 
Practracker: add tolerances for exceptions

When an exception is present, we can now violate the limit by a little
bit and only produce a warning.  The strict flag overrides this
behavior.

I've given file sizes a 2% tolerances and function sizes/include
counts a 10% tolerance.

Part of 30752

6 years agoPractracker: add a --list-overstrict option
Nick Mathewson [Wed, 17 Jul 2019 13:06:34 +0000 (15:06 +0200)] 
Practracker: add a --list-overstrict option

This option lists every exception that is stricter than it needs to
be.

Part of 30752

6 years agoChanges file for 29746.
Nick Mathewson [Thu, 18 Jul 2019 13:27:49 +0000 (09:27 -0400)] 
Changes file for 29746.

6 years agoPractracker: improve exclude-directory logic
Nick Mathewson [Wed, 17 Jul 2019 12:30:12 +0000 (14:30 +0200)] 
Practracker: improve exclude-directory logic

Instead of excluding directories at the last minute if they happen
to appear in our filenames, we exclude them early, before recursing
into all their subdirectories.

Part of 29746.

6 years agoPracktracker: give the number of new errors found.
Nick Mathewson [Wed, 17 Jul 2019 12:09:47 +0000 (14:09 +0200)] 
Pracktracker: give the number of new errors found.

Part of 29746.

6 years agoPractracker: allow tabs in include lines
Nick Mathewson [Wed, 17 Jul 2019 12:02:17 +0000 (14:02 +0200)] 
Practracker: allow tabs in include lines

This isn't actually something that Tor does, but it's cleaner to do
it this way.  Part of 29746.

6 years agoFix practracker_tests.py and practracker line counting.
Nick Mathewson [Wed, 17 Jul 2019 12:00:28 +0000 (14:00 +0200)] 
Fix practracker_tests.py and practracker line counting.

The practracker_tests.py unit test file called a function by its old
name.

Also, practracker counted functions as starting one line after the
function name, and ending with the closing brace.  Now they start
with the open brace and end with the closing brace.

6 years agoMerge branch 'tor-github/pr/1152'
George Kadianakis [Thu, 4 Jul 2019 14:14:06 +0000 (17:14 +0300)] 
Merge branch 'tor-github/pr/1152'

6 years agotypo fix
Roger Dingledine [Wed, 3 Jul 2019 20:01:05 +0000 (16:01 -0400)] 
typo fix

6 years agoclarify a comment in the tor-exit-notice text
Roger Dingledine [Wed, 3 Jul 2019 19:56:17 +0000 (15:56 -0400)] 
clarify a comment in the tor-exit-notice text

(a relay operator in #tor-relays just now was confused and thought
that dirportfrontpage could serve multiple files, like a real webserver.)

6 years agoMerge remote-tracking branch 'tor-github/pr/1136'
Nick Mathewson [Tue, 2 Jul 2019 17:33:50 +0000 (13:33 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1136'

6 years agoMerge remote-tracking branch 'tor-github/pr/1120'
Nick Mathewson [Tue, 2 Jul 2019 17:33:37 +0000 (13:33 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1120'

6 years agoMerge remote-tracking branch 'dgoulet/ticket31008_035_01'
George Kadianakis [Tue, 2 Jul 2019 10:19:40 +0000 (13:19 +0300)] 
Merge remote-tracking branch 'dgoulet/ticket31008_035_01'

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 1 Jul 2019 18:25:13 +0000 (14:25 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
Nick Mathewson [Mon, 1 Jul 2019 18:25:12 +0000 (14:25 -0400)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Mon, 1 Jul 2019 18:25:12 +0000 (14:25 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.5
Nick Mathewson [Mon, 1 Jul 2019 18:25:12 +0000 (14:25 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.5

6 years agoget rid of accidental second space
Roger Dingledine [Sun, 30 Jun 2019 02:26:00 +0000 (22:26 -0400)] 
get rid of accidental second space

6 years agobegin_cell_parse(): Add an assertion to please coverity.
Nick Mathewson [Fri, 28 Jun 2019 15:27:59 +0000 (11:27 -0400)] 
begin_cell_parse(): Add an assertion to please coverity.

Coverity doesn't understand that if begin_cell_parse() returns 0 and
sets is_begindir to 0, its address field will always be set.

Fixes bug 30126; bugfix on 0.2.4.7-alpha; Fixes CID 1447296.

6 years agochanges: file for 28795
teor [Fri, 28 Jun 2019 11:37:37 +0000 (21:37 +1000)] 
changes: file for 28795

Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
in December 2018 (of which ~122 were still functional), with a
list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
in June 2019.

Closes ticket 28795.

Note that we created extra lists from DE and US, but they didn't add
any more fallbacks when we tried to merge them.

6 years agofallback: apply the second fallback list from 2019
teor [Fri, 28 Jun 2019 11:16:50 +0000 (21:16 +1000)] 
fallback: apply the second fallback list from 2019

Update the fallback directory mirrors by merging the current list with:
fallback_dirs_2019-06-28-08-58-39_AU_f0437a39ddbc8459.inc

Part of 28795, see that ticket for logs.

6 years agofallback: apply the first fallback list from 2019
teor [Fri, 28 Jun 2019 11:04:20 +0000 (21:04 +1000)] 
fallback: apply the first fallback list from 2019

Update the fallback directory mirrors by replacing the old list with:
fallback_dirs_2019-06-25-11-49-10_AU_a37adb956fbb5cd2.inc

Part of 28795, see that ticket for logs.

6 years agoman: Fix -help typo to --help
David Goulet [Thu, 27 Jun 2019 18:47:11 +0000 (14:47 -0400)] 
man: Fix -help typo to --help

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'tor-github/pr/1129'
David Goulet [Thu, 27 Jun 2019 14:19:45 +0000 (10:19 -0400)] 
Merge branch 'tor-github/pr/1129'

6 years agodoc: update the man page entries for DirAuthority and FallbackDir
teor [Mon, 24 Jun 2019 03:50:26 +0000 (13:50 +1000)] 
doc: update the man page entries for DirAuthority and FallbackDir

Improve the documentation for the DirAuthority and FallbackDir torrc
options.

Closes ticket 30955.

6 years agoMerge branch 'tor-github/pr/1140'
David Goulet [Wed, 26 Jun 2019 15:39:33 +0000 (11:39 -0400)] 
Merge branch 'tor-github/pr/1140'

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Wed, 26 Jun 2019 14:06:02 +0000 (10:06 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1
Nick Mathewson [Wed, 26 Jun 2019 14:05:51 +0000 (10:05 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1

6 years agoMerge branch 'bug30721_squashed'
Nick Mathewson [Wed, 26 Jun 2019 13:57:20 +0000 (09:57 -0400)] 
Merge branch 'bug30721_squashed'

6 years agotest/addr: test that tor_addr_port_lookup() handles IP addresses and ports
teor [Fri, 14 Jun 2019 01:06:21 +0000 (11:06 +1000)] 
test/addr: test that tor_addr_port_lookup() handles IP addresses and ports

And that it does something sensible with host and host:port.

Also reorder the tests into valid, invalid, and ambiguous.
And add some missing cases.

Note: tor_addr_port_lookup() handles ip, ip:port, host, and host:port.

Tests for 30721.

6 years agotest/addr: test that tor_addr_lookup() handles IP addresses
teor [Thu, 13 Jun 2019 14:49:45 +0000 (00:49 +1000)] 
test/addr: test that tor_addr_lookup() handles IP addresses

And that it fails on IP:port and host:port, and does something sensible with
host.

Tests for 30721.

6 years agotest/addr: test that tor_lookup_hostname() handles IPv4 addresses
teor [Thu, 13 Jun 2019 14:00:05 +0000 (00:00 +1000)] 
test/addr: test that tor_lookup_hostname() handles IPv4 addresses

And that it fails on IPv6 and host:port, and does something sensible with
host.

Tests for 30721.

6 years agotest/addr: Add some ambiguous IPv6 cases to test_addr_parse()
teor [Thu, 13 Jun 2019 13:15:52 +0000 (23:15 +1000)] 
test/addr: Add some ambiguous IPv6 cases to test_addr_parse()

Test some strings which could be parsed as IPv6 addresses,
or as IPv6:port strings.

Additional tests for 30721.

6 years agotest/addr: Increase coverage in test_addr_parse()
teor [Thu, 13 Jun 2019 13:14:16 +0000 (23:14 +1000)] 
test/addr: Increase coverage in test_addr_parse()

Do as many tests as possible for each input string.
Then remove some redundant test cases.

Cleanup after 30721.

6 years agotest/addr: Stop repeating so much code in test_addr_parse()
teor [Thu, 13 Jun 2019 12:30:03 +0000 (22:30 +1000)] 
test/addr: Stop repeating so much code in test_addr_parse()

Cleanup after 30721.

6 years agotest/addr: Add unit tests for the fixes in 30721
teor [Thu, 13 Jun 2019 11:22:27 +0000 (21:22 +1000)] 
test/addr: Add unit tests for the fixes in 30721

6 years agoaddress/resolve: Require square brackets on IPv6 address:ports
teor [Thu, 13 Jun 2019 11:21:19 +0000 (21:21 +1000)] 
address/resolve: Require square brackets on IPv6 address:ports

When parsing addreses via Tor's internal address:port parsing and
DNS lookup APIs, require IPv6 addresses with ports to have square
brackets.

But allow IPv6 addresses without ports, whether or not they have
square brackets.

Fixes bug 30721; bugfix on 0.2.1.5-alpha.

6 years agoaddress/resolve: try harder to avoid returning uninitialised data
teor [Thu, 13 Jun 2019 11:14:36 +0000 (21:14 +1000)] 
address/resolve: try harder to avoid returning uninitialised data

Cleanup after 30721.

6 years agoresolve: split sub-functions out of tor_addr_lookup()
teor [Sun, 2 Jun 2019 08:42:01 +0000 (18:42 +1000)] 
resolve: split sub-functions out of tor_addr_lookup()

And remove the practracker exception for tor_addr_lookup().

Cleanup after 30721.

6 years agoresolve: refactor address family logic in tor_addr_lookup()
teor [Sun, 2 Jun 2019 08:20:25 +0000 (18:20 +1000)] 
resolve: refactor address family logic in tor_addr_lookup()

Cleanup after 30721.

6 years agoresolve: consistently parse IP addresses in square brackets
teor [Sun, 2 Jun 2019 07:46:58 +0000 (17:46 +1000)] 
resolve: consistently parse IP addresses in square brackets

When parsing addreses via Tor's internal DNS lookup API:
* reject IPv4 addresses in square brackets (with or without a port),
* accept IPv6 addresses in square brackets (with or without a port), and
* accept IPv6 addresses without square brackets, as long as they have no port.

This change completes the work started in 23082, making address parsing
consistent between tor's internal DNS lookup and address parsing APIs.

Fixes bug 30721; bugfix on 0.2.1.5-alpha.

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Wed, 26 Jun 2019 13:50:12 +0000 (09:50 -0400)] 
Merge branch 'maint-0.4.1'

"ours" to avoid the 0.4.1 version of #30871.

6 years agoMerge remote-tracking branch 'tor-github/pr/1119'
Nick Mathewson [Wed, 26 Jun 2019 13:50:00 +0000 (09:50 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1119'

6 years agoMerge remote-tracking branch 'tor-github/pr/1118' into maint-0.4.1
Nick Mathewson [Wed, 26 Jun 2019 13:49:40 +0000 (09:49 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1118' into maint-0.4.1

6 years agoMerge remote-tracking branch 'tor-github/pr/1127'
Nick Mathewson [Wed, 26 Jun 2019 13:40:01 +0000 (09:40 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1127'

6 years agoMerge branch 'tor-github/pr/1142'
George Kadianakis [Wed, 26 Jun 2019 07:57:24 +0000 (10:57 +0300)] 
Merge branch 'tor-github/pr/1142'

6 years agoMerge branch 'tor-github/pr/1109'
George Kadianakis [Wed, 26 Jun 2019 07:56:08 +0000 (10:56 +0300)] 
Merge branch 'tor-github/pr/1109'

6 years agoMerge branch 'tor-github/pr/1139'
George Kadianakis [Wed, 26 Jun 2019 07:55:05 +0000 (10:55 +0300)] 
Merge branch 'tor-github/pr/1139'

6 years agoMerge branch 'tor-github/pr/1128'
George Kadianakis [Wed, 26 Jun 2019 07:53:34 +0000 (10:53 +0300)] 
Merge branch 'tor-github/pr/1128'

6 years agoMerge branch 'maint-0.4.1'
George Kadianakis [Wed, 26 Jun 2019 07:51:50 +0000 (10:51 +0300)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'tor-github/pr/1114' into maint-0.4.1
George Kadianakis [Wed, 26 Jun 2019 07:51:12 +0000 (10:51 +0300)] 
Merge branch 'tor-github/pr/1114' into maint-0.4.1

6 years agoChanges file for ticket 30889
Taylor Yu [Tue, 25 Jun 2019 16:38:36 +0000 (11:38 -0500)] 
Changes file for ticket 30889

6 years agoFix some onion helpers
Taylor Yu [Tue, 25 Jun 2019 15:34:53 +0000 (10:34 -0500)] 
Fix some onion helpers

Fix add_onion_helper_clientauth() and add_onion_helper_keyarg() to
explicitly call the appropriate control reply abstractions instead of
allocating a string to pass to their callers.

Part of ticket 30889.

6 years agoMake control_write_reply() mockable
Taylor Yu [Tue, 25 Jun 2019 14:54:50 +0000 (09:54 -0500)] 
Make control_write_reply() mockable

Part of ticket 30889.

6 years agoClean up some uses of low-level control replies
Taylor Yu [Mon, 17 Jun 2019 20:08:11 +0000 (15:08 -0500)] 
Clean up some uses of low-level control replies

Part of ticket 30889.

6 years agoRemove changes files that appeared in 0.4.1.3-alpha or earlier.
Nick Mathewson [Tue, 25 Jun 2019 15:57:08 +0000 (11:57 -0400)] 
Remove changes files that appeared in 0.4.1.3-alpha or earlier.

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Tue, 25 Jun 2019 15:56:22 +0000 (11:56 -0400)] 
Merge branch 'maint-0.4.1'

"ours" to avoid version bump.

6 years agoforward-port the 0.4.1.3-alpha changelog
Nick Mathewson [Tue, 25 Jun 2019 15:56:08 +0000 (11:56 -0400)] 
forward-port the 0.4.1.3-alpha changelog

6 years agobump to 0.4.1.3-alpha-dev
Nick Mathewson [Tue, 25 Jun 2019 15:55:53 +0000 (11:55 -0400)] 
bump to 0.4.1.3-alpha-dev

6 years agostats: add comments about the required chunk structure in extra info files
teor [Mon, 24 Jun 2019 11:20:34 +0000 (21:20 +1000)] 
stats: add comments about the required chunk structure in extra info files

These comments should prevent future instances of 30958.

And allow a larger file in practracker.

Follow up after 30958.

6 years agoMerge branch 'bug30958_041' into bug30958_master
teor [Tue, 25 Jun 2019 02:29:28 +0000 (12:29 +1000)] 
Merge branch 'bug30958_041' into bug30958_master

6 years agoRemove the unused "exitcode" variable from test_rebind.sh
Nick Mathewson [Mon, 24 Jun 2019 17:49:19 +0000 (13:49 -0400)] 
Remove the unused "exitcode" variable from test_rebind.sh

Fixes a shellcheck issue; closes ticket 30964.  No user-visible
change.

6 years agoDon't try to shellcheck src/rust/registry
Nick Mathewson [Mon, 24 Jun 2019 17:45:05 +0000 (13:45 -0400)] 
Don't try to shellcheck src/rust/registry

Fixes bug 30963; bug not in any released Tor.

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 24 Jun 2019 17:36:42 +0000 (13:36 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge remote-tracking branch 'tor-github/pr/1131'
Nick Mathewson [Mon, 24 Jun 2019 17:36:36 +0000 (13:36 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1131'

6 years agoMerge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1
Nick Mathewson [Mon, 24 Jun 2019 17:36:10 +0000 (13:36 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 24 Jun 2019 13:32:54 +0000 (09:32 -0400)] 
Merge branch 'maint-0.4.1'

"ours" to avoid version bump.

6 years agobump to 0.4.1.3-alpha
Nick Mathewson [Mon, 24 Jun 2019 13:32:46 +0000 (09:32 -0400)] 
bump to 0.4.1.3-alpha

6 years agoMerge branch 'bug30958_040' into bug30958_041
teor [Mon, 24 Jun 2019 11:31:27 +0000 (21:31 +1000)] 
Merge branch 'bug30958_040' into bug30958_041

6 years agoMerge branch 'bug30958_035' into bug30958_040
teor [Mon, 24 Jun 2019 11:31:10 +0000 (21:31 +1000)] 
Merge branch 'bug30958_035' into bug30958_040

6 years agoMerge branch 'bug30958_029' into bug30958_035
teor [Mon, 24 Jun 2019 11:30:47 +0000 (21:30 +1000)] 
Merge branch 'bug30958_029' into bug30958_035

6 years agostats: Stop removing the ed25519 signature if the extra info file is too big
teor [Mon, 24 Jun 2019 11:19:49 +0000 (21:19 +1000)] 
stats: Stop removing the ed25519 signature if the extra info file is too big

If the signature data was removed, but the keyword was kept, this could
result in an unparseable extra info file.

Fixes bug 30958; bugfix on 0.2.7.2-alpha.

6 years agostats: Split extrainfo_dump_to_string() into smaller functions.
teor [Mon, 24 Jun 2019 10:32:38 +0000 (20:32 +1000)] 
stats: Split extrainfo_dump_to_string() into smaller functions.

Closes ticket 30956.

6 years agoMerge branch 'bug30956_041' into bug30956_master
teor [Mon, 24 Jun 2019 09:47:34 +0000 (19:47 +1000)] 
Merge branch 'bug30956_041' into bug30956_master

6 years agostats: Always publish pluggable transports in extra info documents
teor [Mon, 24 Jun 2019 09:44:24 +0000 (19:44 +1000)] 
stats: Always publish pluggable transports in extra info documents

Always publish bridge pluggable transport information in the extra info
descriptor, even if ExtraInfoStatistics is 0. This information is
needed by BridgeDB.

Fixes bug 30956; bugfix on 0.4.1.1-alpha.

6 years agoImprove comment in .travis.yml
rl1987 [Sun, 23 Jun 2019 11:12:05 +0000 (14:12 +0300)] 
Improve comment in .travis.yml

6 years agoFix shellcheck warning SC2034 in test_rebind.sh.
rl1987 [Sun, 23 Jun 2019 11:00:43 +0000 (14:00 +0300)] 
Fix shellcheck warning SC2034 in test_rebind.sh.

Bugfix on be0a4be276c945e4e90b43ce8f784b5b75bef122 (not in any Tor release).

6 years agoAdd changes file
rl1987 [Sun, 23 Jun 2019 10:38:49 +0000 (13:38 +0300)] 
Add changes file

6 years agoOn Travis, put random data in ~/.torrc
rl1987 [Sun, 23 Jun 2019 10:31:47 +0000 (13:31 +0300)] 
On Travis, put random data in ~/.torrc

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Wed, 19 Jun 2019 18:29:22 +0000 (14:29 -0400)] 
Merge branch 'maint-0.4.1'

"ours" merge to avoid taking pracktracker removal.

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

6 years agohs-v3: Close intro circuits when cleaning client cache
David Goulet [Wed, 19 Jun 2019 13:22:07 +0000 (09:22 -0400)] 
hs-v3: Close intro circuits when cleaning client cache

Fixes #30921

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agochanges: Fix typo in changes/ticket30893
David Goulet [Wed, 19 Jun 2019 11:50:02 +0000 (07:50 -0400)] 
changes: Fix typo in changes/ticket30893

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'tor-github/pr/1113'
David Goulet [Wed, 19 Jun 2019 11:47:03 +0000 (07:47 -0400)] 
Merge branch 'tor-github/pr/1113'

6 years agoMake the great grand practracker happy...
David Goulet [Tue, 18 Jun 2019 17:33:10 +0000 (13:33 -0400)] 
Make the great grand practracker happy...

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoguard: Ignore marked for close circuit when changing state to open
David Goulet [Tue, 18 Jun 2019 17:32:45 +0000 (13:32 -0400)] 
guard: Ignore marked for close circuit when changing state to open

When we consider all circuits in "waiting for guard" state to be promoted to
an "open" state, we were considering all circuits, even the one marked for
close.

This ultiamtely triggers a "circuit_has_opened()" called on the circuit that
is marked for close which then leads to possible undesirable behaviors within
a subsystem.

For instance, the HS subsystem would be unable to find the authentication key
of the introduction point circuit leading to a BUG() warning and a duplicate
mark for close on the circuit.

This commit also adds a unit test to make sure we never select marked for
close circuits when upgrading its guard state from waiting for guard to open.

Fixes #30871

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMake the great grand practracker happy...
David Goulet [Tue, 18 Jun 2019 17:33:10 +0000 (13:33 -0400)] 
Make the great grand practracker happy...

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoguard: Ignore marked for close circuit when changing state to open
David Goulet [Tue, 18 Jun 2019 17:32:45 +0000 (13:32 -0400)] 
guard: Ignore marked for close circuit when changing state to open

When we consider all circuits in "waiting for guard" state to be promoted to
an "open" state, we were considering all circuits, even the one marked for
close.

This ultiamtely triggers a "circuit_has_opened()" called on the circuit that
is marked for close which then leads to possible undesirable behaviors within
a subsystem.

For instance, the HS subsystem would be unable to find the authentication key
of the introduction point circuit leading to a BUG() warning and a duplicate
mark for close on the circuit.

This commit also adds a unit test to make sure we never select marked for
close circuits when upgrading its guard state from waiting for guard to open.

Fixes #30871

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge remote-tracking branch 'tor-github/pr/1115'
Nick Mathewson [Tue, 18 Jun 2019 13:10:34 +0000 (09:10 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1115'