cfff582e4d
Bump version in master to 0.3.4.0-alpha-dev
2018-02-15 20:11:25 -05:00
744399ea78
Merge branch 'protover_rust_compat_v3'
2018-02-15 20:00:33 -05:00
5af03c1ef3
rust protover: match the C implementation on empty-str cases
...
Empty versions lists are permitted; empty keywords are not.
2018-02-15 19:08:52 -05:00
b58a2febe3
Forbid u32::MAX as a protover range element in rust
...
Part of the 25249 fix to make rust match the C.
2018-02-15 19:07:38 -05:00
f69510ba4b
Rust protover compat: forbid more than MAX_VERSIONS_TO_EXPAND in a range
...
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.
2018-02-15 19:07:25 -05:00
f6a230ec95
Merge remote-tracking branch 'mikeperry/bug24769'
2018-02-14 10:03:14 -05:00
9e566f3a72
Merge branch 'tests_rust'
2018-02-13 18:12:01 -05:00
17c6de2493
Merge branch 'maint-0.3.2'
2018-02-13 16:55:34 -05:00
cb9a322b67
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-13 16:55:19 -05:00
f647035b37
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-13 16:55:18 -05:00
f0ed7895ca
fix make check-changes
2018-02-13 15:07:55 -06:00
86f461e362
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
2018-02-13 15:00:43 -05:00
e7f6314782
Make check-changes happy
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 14:56:31 -05:00
9cf8d669fa
man: Document default values if not in the consensus for DoS mitigation
...
Fixes #25236
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 14:21:47 -05:00
b60ffc5ce0
Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05
2018-02-13 13:11:10 -05:00
305e39d0f8
dos: Add extra safety asserts in cc_stats_refill_bucket()
...
Never allow the function to set a bucket value above the allowed circuit
burst.
Closes #25202
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 10:41:21 -05:00
4fe4f8179f
dos: Don't set consensus param if we aren't a public relay
...
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>
2018-02-13 10:35:41 -05:00
412a8256a5
Remove 25170 changes file from master: it was already merged in 0.3.3.2-alpha
2018-02-13 08:51:29 -05:00
b062730a11
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-13 08:50:59 -05:00
5e3c545af7
Merge branch 'maint-0.3.2'
2018-02-13 08:50:59 -05:00
17a923941a
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-13 08:50:58 -05:00
e658dad625
dirserv: Improve returned message when relay is rejected
...
Explicitly inform the operator of the rejected relay to set a valid email
address in the ContactInfo field and contact bad-relays@ mailing list.
Fixes #25170
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 08:47:42 -05:00
ef164346d4
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
2018-02-13 08:47:06 -05:00
1555946e20
Have tor_addr hashes return a randomized hash for AF_UNSPEC.
...
We don't expect this to come up very much, but we may as well make
sure that the value isn't predictable (as we do for the other
addresses) in case the issue ever comes up.
Spotted by teor.
2018-02-12 11:14:36 -05:00
99fbbc6c47
Fix a typo in an address_set.c comment.
2018-02-12 11:14:34 -05:00
4f98ec9fd3
Merge branch 'maint-0.3.2'
2018-02-12 08:33:48 -05:00
021c3bd587
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-12 08:33:47 -05:00
91109bc813
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-12 08:33:47 -05:00
e91bae66d8
Merge branch 'bug23318-redux_029' into maint-0.2.9
2018-02-12 08:33:03 -05:00
019bb55181
Merge branch 'maint-0.3.2'
2018-02-11 18:11:04 -05:00
98fc8cd937
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 18:11:04 -05:00
b2c4d4e7fa
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:11:04 -05:00
84c13336c4
Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
2018-02-11 18:10:59 -05:00
a7f5ece2b9
Merge branch 'maint-0.3.2'
2018-02-11 18:09:35 -05:00
67043d957f
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 18:09:35 -05:00
8939eaf479
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:09:35 -05:00
848ba26c18
Merge branch 'ticket24315_029' into maint-0.2.9
2018-02-11 18:07:37 -05:00
bdc29eaa7e
Merge branch 'maint-0.3.2'
2018-02-11 17:01:00 -05:00
684d57fe8a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 17:00:52 -05:00
eccef6ba60
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 16:51:56 -05:00
5dc785ceef
Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9
2018-02-11 16:51:53 -05:00
a75ae628c7
Merge remote-tracking branch 'isis/bug25127_redux'
2018-02-11 16:17:41 -05:00
7aa94f7441
fix compilation.
2018-02-11 16:16:58 -05:00
3834441a72
chnages file for 25120
2018-02-11 16:14:19 -05:00
627974b02e
Merge branch 'bug25120'
2018-02-11 16:10:58 -05:00
14c47a0b5c
Lower log-level in different error conditions in entropy selection.
...
This patch lowers the log-level from warning to info in the cases where
we are going to attempt another method as entropy source to hopefully
make the user feel less concerned.
See: https://bugs.torproject.org/25120
2018-02-11 16:10:50 -05:00
4de20d1754
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-10 16:09:01 -05:00
1df701c082
Merge branch 'maint-0.3.2'
2018-02-10 16:09:01 -05:00
86583ad78e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-10 16:09:00 -05:00
320dac4602
Merge branch 'bug24978_029_enable' into maint-0.2.9
2018-02-10 16:08:58 -05:00
Nick Mathewson
Taylor Yu
David Goulet
Alexander Færøy