]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 13 Nov 2017 16:15:50 +0000 (11:15 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 13 Nov 2017 16:15:50 +0000 (11:15 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 13 Nov 2017 16:15:50 +0000 (11:15 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 13 Nov 2017 16:15:50 +0000 (11:15 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'bug8185_025' into maint-0.2.9
Nick Mathewson [Mon, 13 Nov 2017 16:15:47 +0000 (11:15 -0500)] 
Merge branch 'bug8185_025' into maint-0.2.9

8 years agoMerge branch 'bug8185_031' into maint-0.3.1
Nick Mathewson [Mon, 13 Nov 2017 16:15:40 +0000 (11:15 -0500)] 
Merge branch 'bug8185_031' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 13 Nov 2017 16:13:22 +0000 (11:13 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 13 Nov 2017 16:13:22 +0000 (11:13 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 13 Nov 2017 16:13:22 +0000 (11:13 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 13 Nov 2017 16:13:22 +0000 (11:13 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'ticket21953_029' into maint-0.2.9
Nick Mathewson [Mon, 13 Nov 2017 16:13:18 +0000 (11:13 -0500)] 
Merge branch 'ticket21953_029' into maint-0.2.9

8 years agoNote in the rust doc that these comments are bidirectional
Nick Mathewson [Mon, 13 Nov 2017 15:04:40 +0000 (10:04 -0500)] 
Note in the rust doc that these comments are bidirectional

8 years agoAdd corresponding rust-c coupling comments to C
Nick Mathewson [Mon, 13 Nov 2017 15:03:46 +0000 (10:03 -0500)] 
Add corresponding rust-c coupling comments to C

8 years agoMerge remote-tracking branch 'chelseakomlo/24032-cargo-rust-sync'
Nick Mathewson [Mon, 13 Nov 2017 14:59:10 +0000 (09:59 -0500)] 
Merge remote-tracking branch 'chelseakomlo/24032-cargo-rust-sync'

8 years agoupdate rust getting started for new build
Chelsea Holland Komlo [Mon, 6 Nov 2017 17:55:10 +0000 (12:55 -0500)] 
update rust getting started for new build

8 years agoMake node_get_curve25519_onion_key() return a const ptr
Nick Mathewson [Sun, 12 Nov 2017 22:07:16 +0000 (17:07 -0500)] 
Make node_get_curve25519_onion_key() return a const ptr

8 years agoMerge branch 'bug23577_squashed'
Nick Mathewson [Sun, 12 Nov 2017 22:05:39 +0000 (17:05 -0500)] 
Merge branch 'bug23577_squashed'

8 years agoMake setup_introduce1_data() take a node_t instead of an extend_info_t
Neel Chauhan [Wed, 8 Nov 2017 23:36:10 +0000 (18:36 -0500)] 
Make setup_introduce1_data() take a node_t instead of an extend_info_t

Clients add rendezvous point IPv6 addresses to introduce cell link specifiers,
when the node has a valid IPv6 address.

Also check the node's IPv4 address is valid before adding any link specifiers.

Implements #23577.

8 years agoIntroduce node_get_curve25519_onion_key()
Neel Chauhan [Wed, 8 Nov 2017 23:33:30 +0000 (18:33 -0500)] 
Introduce node_get_curve25519_onion_key()

8 years agoannotate where C and Rust need to stay in sync
Chelsea Holland Komlo [Sun, 12 Nov 2017 03:26:22 +0000 (22:26 -0500)] 
annotate where C and Rust need to stay in sync

8 years agoMerge branch 'bug24247_032'
Nick Mathewson [Sat, 11 Nov 2017 19:46:33 +0000 (14:46 -0500)] 
Merge branch 'bug24247_032'

8 years agoFix mock_crypto_pk_public_checksig__nocheck() to handle short RSA keys
Nick Mathewson [Sat, 11 Nov 2017 19:42:39 +0000 (14:42 -0500)] 
Fix mock_crypto_pk_public_checksig__nocheck() to handle short RSA keys

This function -- a mock replacement used only for fuzzing -- would
have a buffer overflow if it got an RSA key whose modulus was under
20 bytes long.

Fortunately, Tor itself does not appear to have a bug here.

Fixes bug 24247; bugfix on 0.3.0.3-alpha when fuzzing was
introduced.  Found by OSS-Fuzz; this is OSS-Fuzz issue 4177.

8 years agonew email address for yuri; close 24241
Nick Mathewson [Sat, 11 Nov 2017 17:47:13 +0000 (12:47 -0500)] 
new email address for yuri; close 24241

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Sat, 11 Nov 2017 17:23:34 +0000 (12:23 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Sat, 11 Nov 2017 17:23:34 +0000 (12:23 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Sat, 11 Nov 2017 17:23:34 +0000 (12:23 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Sat, 11 Nov 2017 17:23:33 +0000 (12:23 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Sat, 11 Nov 2017 17:23:33 +0000 (12:23 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Sat, 11 Nov 2017 17:23:33 +0000 (12:23 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoUpdate geoip and geoip6 to the November 6 2017 database.
Karsten Loesing [Fri, 10 Nov 2017 09:14:09 +0000 (10:14 +0100)] 
Update geoip and geoip6 to the November 6 2017 database.

8 years agoslight improvement to rust idiomicity
Nick Mathewson [Thu, 9 Nov 2017 14:48:52 +0000 (09:48 -0500)] 
slight improvement to rust idiomicity

8 years agoRust implementation of protocol_list_supports_protocol_or_later()
Nick Mathewson [Thu, 9 Nov 2017 14:42:09 +0000 (09:42 -0500)] 
Rust implementation of protocol_list_supports_protocol_or_later()

8 years agoFix unit test behavior: we need to be in STATE_LIVE.
Nick Mathewson [Thu, 9 Nov 2017 14:30:43 +0000 (09:30 -0500)] 
Fix unit test behavior: we need to be in STATE_LIVE.

8 years agomissing subcategory
Nick Mathewson [Thu, 9 Nov 2017 14:23:12 +0000 (09:23 -0500)] 
missing subcategory

8 years agoMerge branch 'ticket12062_squashed'
Nick Mathewson [Thu, 9 Nov 2017 14:20:55 +0000 (09:20 -0500)] 
Merge branch 'ticket12062_squashed'

8 years agoAudit all of the "is the network turned off" checks.
Nick Mathewson [Thu, 21 Sep 2017 18:34:36 +0000 (14:34 -0400)] 
Audit all of the "is the network turned off" checks.

DisableNetwork is a subset of net_is_disabled(), which is (now) a
subset of should_delay_dir_fetches().

Some of these changes are redundant with others higher or lower in
the call stack.  The ones that I think are behavior-relevant are
listed in the changes file.  I've also added comments in a few
places where the behavior is subtle.

Fixes bug 12062; bugfix on various versions.

8 years agoMerge branch 'ticket20895'
Nick Mathewson [Thu, 9 Nov 2017 14:17:53 +0000 (09:17 -0500)] 
Merge branch 'ticket20895'

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 9 Nov 2017 13:17:46 +0000 (08:17 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug23985_029' into maint-0.3.2
Nick Mathewson [Thu, 9 Nov 2017 13:15:46 +0000 (08:15 -0500)] 
Merge branch 'bug23985_029' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 9 Nov 2017 13:02:36 +0000 (08:02 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoRe-remove AllowDotExit deprecation.
Nick Mathewson [Thu, 9 Nov 2017 12:58:27 +0000 (07:58 -0500)] 
Re-remove AllowDotExit deprecation.

This was accidentally reintroduced in 5a46074e55.  It should be
harmless, though: the option is obsolete, so calling it deprecated
is redundant.

8 years agoforward-port the 0.3.2.4-alpha changelog.
Nick Mathewson [Wed, 8 Nov 2017 21:45:34 +0000 (16:45 -0500)] 
forward-port the 0.3.2.4-alpha changelog.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 8 Nov 2017 21:45:03 +0000 (16:45 -0500)] 
Merge branch 'maint-0.3.2'

"ours" merge to avoid version bump.

8 years agobump to 0.3.2.4-alpha-dev
Nick Mathewson [Wed, 8 Nov 2017 21:44:53 +0000 (16:44 -0500)] 
bump to 0.3.2.4-alpha-dev

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 8 Nov 2017 19:59:18 +0000 (14:59 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'dgoulet/bug24186_032_01' into maint-0.3.2
Nick Mathewson [Wed, 8 Nov 2017 19:49:16 +0000 (14:49 -0500)] 
Merge remote-tracking branch 'dgoulet/bug24186_032_01' into maint-0.3.2

8 years agodirauth: Recalculate voting schedule at first vote
David Goulet [Wed, 8 Nov 2017 19:36:04 +0000 (14:36 -0500)] 
dirauth: Recalculate voting schedule at first vote

Commit e67f4441eb2646368e3e7cb1bcee403667b786f0 introduced a safeguard against
using an uninitialized voting schedule object. However, the dirvote_act() code
was looking roughly at the same thing to know if it had to compute the timings
before voting with this condition:

  if (!voting_schedule.voting_starts) {
    ...
    dirvote_recalculate_timing(options, now);
  }

The sr_init() function is called very early and goes through the safeguard
thus the voting schedule is always initilized before the first vote.

That first vote is a crucial one because we need to have our voting schedule
aligned to the "now" time we are about to use for voting. Then, the schedule
is updated when we publish our consensus or/and when we set a new consensus.
From that point on, we only want to update the voting schedule through that
code flow.

This "created_on_demand" is indicating that the timings have been recalculated
on demand by another subsystem so if it is flagged, we know that we need to
ignore its values before voting.

Fixes #24186

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 8 Nov 2017 18:26:50 +0000 (13:26 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'dgoulet/ticket24134_032_01' into maint-0.3.2
Nick Mathewson [Wed, 8 Nov 2017 18:26:46 +0000 (13:26 -0500)] 
Merge remote-tracking branch 'dgoulet/ticket24134_032_01' into maint-0.3.2

8 years agoDon't delay descriptor fetches when missing info needed for circuits
Nick Mathewson [Wed, 8 Nov 2017 18:22:16 +0000 (13:22 -0500)] 
Don't delay descriptor fetches when missing info needed for circuits

When we have fewer than 15 descriptors to fetch, we will delay the
fetch for a little while.  That's fine, if we can go ahead and build
circuits... but if not, it's a poor choice indeed.

Fixes bug 23985; bugfix on 0.1.1.11-alpha.

In 0.3.0.3-alpha, when we made primary guard descriptors necessary
for circuit building, this situation got worse.

8 years agodowngrade severity for get_voting_schedule()
Nick Mathewson [Wed, 8 Nov 2017 16:50:57 +0000 (11:50 -0500)] 
downgrade severity for get_voting_schedule()

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 8 Nov 2017 16:02:51 +0000 (11:02 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'dgoulet/bug23751_032_01' into maint-0.3.2
Nick Mathewson [Wed, 8 Nov 2017 15:56:33 +0000 (10:56 -0500)] 
Merge remote-tracking branch 'dgoulet/bug23751_032_01' into maint-0.3.2

8 years agoMerge branch 'bug23318-redux_029' into maint-0.3.2
Nick Mathewson [Wed, 8 Nov 2017 15:47:22 +0000 (10:47 -0500)] 
Merge branch 'bug23318-redux_029' into maint-0.3.2

8 years agoStop calculating total twice in frac_nodes_with_descriptors()
teor [Wed, 8 Nov 2017 03:18:46 +0000 (14:18 +1100)] 
Stop calculating total twice in frac_nodes_with_descriptors()

Cleanup after 23318.

8 years agoCheck arguments and initialise variables in compute_weighted_bandwidths()
teor [Wed, 8 Nov 2017 03:17:37 +0000 (14:17 +1100)] 
Check arguments and initialise variables in compute_weighted_bandwidths()

Cleanup after 23318.

8 years agoActually log the total bandwidth in compute_weighted_bandwidths()
teor [Wed, 8 Nov 2017 03:17:03 +0000 (14:17 +1100)] 
Actually log the total bandwidth in compute_weighted_bandwidths()

Fixes bug 24170; bugfix on 0.2.4.3-alpha.

8 years agoUse node counts in networks with all zero-bandwidths
teor [Wed, 8 Nov 2017 03:09:50 +0000 (14:09 +1100)] 
Use node counts in networks with all zero-bandwidths

When calculating the fraction of nodes that have descriptors, and all
all nodes in the network have zero bandwidths, count the number of nodes
instead.

Fixes bug 23318; bugfix on 0.2.4.10-alpha.

8 years agoRemove an erroneous 0.5 in compute_weighted_bandwidths()
Nick Mathewson [Fri, 22 Sep 2017 19:29:15 +0000 (15:29 -0400)] 
Remove an erroneous 0.5 in compute_weighted_bandwidths()

Back in 0.2.4.3-alpha (e106812a778f537), when we switched from using
double to using uint64 for selecting by bandwidth, I got the math
wrong: I should have used llround(x), or (uint64_t)(x+0.5), but
instead I wrote llround(x+0.5).  That means we would always round
up, rather than rounding to the closest integer

Fixes bug 23318; bugfix on 0.2.4.3-alpha.

8 years agodoc: Put the release timeline link in README
David Goulet [Wed, 8 Nov 2017 15:44:00 +0000 (10:44 -0500)] 
doc: Put the release timeline link in README

Closes #24134

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agosched: Ignore closed channel after flushing cells
David Goulet [Wed, 8 Nov 2017 14:44:39 +0000 (09:44 -0500)] 
sched: Ignore closed channel after flushing cells

The flush cells process can close a channel if the connection write fails but
still return that it flushed at least one cell. This is due because the error
is not propagated up the call stack so there is no way of knowing if the flush
actually was successful or not.

Because this would require an important refactoring touching multiple
subsystems, this patch is a bandaid to avoid the KIST scheduler to handle
closed channel in its loop.

Bandaid on #23751.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 8 Nov 2017 13:13:14 +0000 (08:13 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug23816_029_squashed' into maint-0.3.2
Nick Mathewson [Wed, 8 Nov 2017 13:11:22 +0000 (08:11 -0500)] 
Merge branch 'bug23816_029_squashed' into maint-0.3.2

8 years agoReplace our random-exponential-delay algorithm.
Nick Mathewson [Tue, 17 Oct 2017 17:24:40 +0000 (13:24 -0400)] 
Replace our random-exponential-delay algorithm.

This patch has implementations of the "decorrelated" and "full"
algorithms from https://www.awsarchitectureblog.com/2015/03/backoff.html

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 8 Nov 2017 01:36:04 +0000 (20:36 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoRevert "Remove an erroneous 0.5 in compute_weighted_bandwidths()"
Nick Mathewson [Wed, 8 Nov 2017 01:35:19 +0000 (20:35 -0500)] 
Revert "Remove an erroneous 0.5 in compute_weighted_bandwidths()"

This reverts commit 01e984870a7e1db2722e85fe43af7bcb4755c2d4.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Tue, 7 Nov 2017 19:01:10 +0000 (14:01 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2
Nick Mathewson [Tue, 7 Nov 2017 19:00:18 +0000 (14:00 -0500)] 
Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Tue, 7 Nov 2017 18:22:37 +0000 (13:22 -0500)] 
Merge branch 'maint-0.3.2'

"ours" merge to avoid version bump.

8 years agoBump to 0.3.2.4-alpha
Nick Mathewson [Tue, 7 Nov 2017 18:22:27 +0000 (13:22 -0500)] 
Bump to 0.3.2.4-alpha

8 years agoAdd a safe guard to avoid using a zeroed voting schedule
David Goulet [Tue, 7 Nov 2017 16:14:45 +0000 (11:14 -0500)] 
Add a safe guard to avoid using a zeroed voting schedule

dirvote_get_next_valid_after_time() is the only public function that uses the
voting schedule outside of the dirvote subsystem so if it is zeroed,
recalculate its timing if we can that is if a consensus exists.

Part of #24161

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoRecalculate voting schedule first when getting a new consensus
David Goulet [Tue, 7 Nov 2017 16:08:12 +0000 (11:08 -0500)] 
Recalculate voting schedule first when getting a new consensus

Because the HS and SR subsystems can use the voting schedule early (with the
changes in #23623 making the SR subsystem using the static voting schedule
object), we need to recalculate the schedule very early when setting the new
consensus.

Fixes #24161

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Tue, 7 Nov 2017 14:58:53 +0000 (09:58 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'asn/ticket23623_032_01' into maint-0.3.2
Nick Mathewson [Tue, 7 Nov 2017 14:58:42 +0000 (09:58 -0500)] 
Merge remote-tracking branch 'asn/ticket23623_032_01' into maint-0.3.2

8 years agoAdd changes file for #23623.
George Kadianakis [Mon, 6 Nov 2017 22:28:14 +0000 (00:28 +0200)] 
Add changes file for #23623.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 6 Nov 2017 18:01:56 +0000 (13:01 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'bug24150_032_squashed' into maint-0.3.2
Nick Mathewson [Mon, 6 Nov 2017 17:59:23 +0000 (12:59 -0500)] 
Merge branch 'bug24150_032_squashed' into maint-0.3.2

8 years agoFix a memory leak on decryption non-failure of v3 hsdesc
Nick Mathewson [Sun, 5 Nov 2017 17:21:16 +0000 (12:21 -0500)] 
Fix a memory leak on decryption non-failure of v3 hsdesc

If it decrypts something that turns out to start with a NUL byte,
then decrypt_desc_layer() will return 0 to indicate the length of
its result.  But 0 also indicates an error, which causes the result
not to be freed by decrypt_desc_layer()'s callers.

Since we're trying to stabilize 0.3.2.x, I've opted for the simpler
possible fix here and made it so that an empty decrypted string will
also count as an error.

Fixes bug 24150 and OSS-Fuzz issue 3994.

The original bug was present but unreachable in 0.3.1.1-alpha. I'm
calling this a bugfix on 0.3.2.1-alpha since that's the first version
where you could actually try to decrypt these descriptors.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 6 Nov 2017 15:16:19 +0000 (10:16 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoFix a 32-bit formatting warning
Nick Mathewson [Mon, 6 Nov 2017 15:16:10 +0000 (10:16 -0500)] 
Fix a 32-bit formatting warning

8 years agoMerge remote-tracking branch 'atagar/manual'
Nick Mathewson [Mon, 6 Nov 2017 15:05:22 +0000 (10:05 -0500)] 
Merge remote-tracking branch 'atagar/manual'

8 years agoMerge remote-tracking branch 'dgoulet/bug24053_033_01'
Nick Mathewson [Mon, 6 Nov 2017 15:04:22 +0000 (10:04 -0500)] 
Merge remote-tracking branch 'dgoulet/bug24053_033_01'

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 6 Nov 2017 14:49:06 +0000 (09:49 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'public/bug23318_029' into maint-0.3.2
Nick Mathewson [Mon, 6 Nov 2017 14:48:51 +0000 (09:48 -0500)] 
Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2

8 years agoFix manual formatting
Damian Johnson [Sun, 5 Nov 2017 20:21:28 +0000 (12:21 -0800)] 
Fix manual formatting

Few issues...

  * Malformed ReducedExitPolicy, causing brackets to appear.

  * ExitPolicyDefault wasn't actually listed, instead it munged the description
    into the ExitPolicy description.

  * Extra plus signs in the ExitPolicy and ReducedExitPolicy entries. After an
    hour of struggling with asciidoc couldn't figure out how to format it as
    'paragraph => example => paragraph with same indentation' so just
    rearranging the ExitPolicy entry.

    Patches welcome if someone strongly prefers having the paragraph after the
    example.

https://trac.torproject.org/projects/tor/ticket/24147

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Sun, 5 Nov 2017 19:41:53 +0000 (14:41 -0500)] 
Merge branch 'maint-0.3.2'

8 years agolintchanges: Allow 'fixes bugs a, b, and c'
Nick Mathewson [Sun, 5 Nov 2017 19:41:39 +0000 (14:41 -0500)] 
lintchanges: Allow 'fixes bugs a, b, and c'

8 years agoMerge branch 'bug21394_029' into maint-0.3.2
Nick Mathewson [Sun, 5 Nov 2017 19:39:37 +0000 (14:39 -0500)] 
Merge branch 'bug21394_029' into maint-0.3.2

8 years agoFix DNS resolution on busy exit relays
Sebastian Hahn [Fri, 3 Nov 2017 02:06:12 +0000 (03:06 +0100)] 
Fix DNS resolution on busy exit relays

Thanks to Dhalgren who analyzed this issue two years ago and found a
solution!

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Sun, 5 Nov 2017 19:09:21 +0000 (14:09 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoticket21031 changes file revised.
Nick Mathewson [Sun, 5 Nov 2017 19:09:07 +0000 (14:09 -0500)] 
ticket21031 changes file revised.

8 years agoFix rust welcome message typo.
Alex Xu (Hello71) [Sun, 5 Nov 2017 15:47:49 +0000 (15:47 +0000)] 
Fix rust welcome message typo.

8 years agoClientDNSRejectInternalAddresses in non-default networks
Sebastian Hahn [Sat, 4 Nov 2017 15:37:41 +0000 (16:37 +0100)] 
ClientDNSRejectInternalAddresses in non-default networks

Once again allow the flag to be set, unless the default network is used.
Thanks to nickm for a suggestion for the workaround to a test failure.

8 years agoUndo deprecation of ClientDNSRejectInternalAddresses
Sebastian Hahn [Sat, 4 Nov 2017 15:24:52 +0000 (16:24 +0100)] 
Undo deprecation of ClientDNSRejectInternalAddresses

8 years agoRevert "Make ClientDNSRejectInternalAddresses testing-only."
Sebastian Hahn [Fri, 3 Nov 2017 22:00:27 +0000 (23:00 +0100)] 
Revert "Make ClientDNSRejectInternalAddresses testing-only."

This reverts commit 27fa4a98d23972213122fa99499efa4baebe49e3.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 2 Nov 2017 14:34:08 +0000 (10:34 -0400)] 
Merge branch 'maint-0.3.2'

8 years agonodelist: Downgrade warning to protocol warning
David Goulet [Wed, 1 Nov 2017 16:15:15 +0000 (12:15 -0400)] 
nodelist: Downgrade warning to protocol warning

The node_get_ed25519_id() warning can actually be triggered by a relay flagged
with NoEdConsensus so instead of triggering a warning on all relays of the
network, downgrade it to protocol warning.

Fixes #24025

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 2 Nov 2017 14:32:18 +0000 (10:32 -0400)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'dgoulet_ticket23753_032_02_squashed' into maint-0.3.2
Nick Mathewson [Thu, 2 Nov 2017 14:30:42 +0000 (10:30 -0400)] 
Merge branch 'dgoulet_ticket23753_032_02_squashed' into maint-0.3.2

8 years agosched: Rate limit scheduler_bug_occurred()
David Goulet [Thu, 26 Oct 2017 18:44:44 +0000 (14:44 -0400)] 
sched: Rate limit scheduler_bug_occurred()

Just in case we end up hitting a SCHED_BUG() multiple times, rate limit the
log warning.

Signed-off-by: David Goulet <dgoulet@torproject.org>