Closes most of #25323.

"ours" merge to avoid taking 24902 a second time and having to reconcile
all the merge conflicts.

These patches were already merged, and so don't need a changes file
in these branches.

"ours" merge to avoid conflicts with the cherry-picked fix for 24898.

Roger Dingledine authored 7 years ago and Nick Mathewson committed 7 years ago

since all it does is produce false positives

this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even
though the code in the previous commit is already present in 0.3.1. sorry
for the mess.

[Cherry-picked]

Roger Dingledine authored 7 years ago and Nick Mathewson committed 7 years ago

since all it does is produce false positives

this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even
though the code in the previous commit is already present in 0.3.1. sorry
for the mess.

Roger Dingledine authored 7 years ago and Nick Mathewson committed 7 years ago

This commit takes a piece of commit af8cadf3 and a piece of commit
46fe353f25, with the goal of making channel_is_client() be based on what
sort of connection handshake the other side used, rather than seeing
whether the other side ever sent a create_fast cell to us.

 * FIXES #25271: https://bugs.torproject.org/25271

Empty versions lists are permitted; empty keywords are not.

Part of the 25249 fix to make rust match the C.

Also correct MAX_VERSIONS_TO_EXPAND to match the C.

NOTE that this patch leads to incorrect behavior: the C code allows
huge ranges; it just doesn't allow votes on them (currently).  For
full compatibility, we'll need to make the rust code store ranges as
ranges natively, possibly using something like the range_map crate.

Still, this patch is smaller than a "proper" fix.

Fixes TROVE-2018-003.

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

Fixes #25236

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

Never allow the function to set a bucket value above the allowed circuit
burst.

Closes #25202

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

We had this safeguard around dos_init() but not when the consensus changes
which can modify consensus parameters and possibly enable the DoS mitigation
even if tor wasn't a public relay.

Fixes #25223

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