David Goulet
e7f6314782
Make check-changes happy
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 14:56:31 -05:00
David Goulet
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
David Goulet
b60ffc5ce0
Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05
2018-02-13 13:11:10 -05:00
David Goulet
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
David Goulet
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
Nick Mathewson
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
Nick Mathewson
b062730a11
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-13 08:50:59 -05:00
Nick Mathewson
5e3c545af7
Merge branch 'maint-0.3.2'
2018-02-13 08:50:59 -05:00
Nick Mathewson
17a923941a
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-13 08:50:58 -05:00
David Goulet
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
Nick Mathewson
ef164346d4
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
2018-02-13 08:47:06 -05:00
Nick Mathewson
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
Nick Mathewson
99fbbc6c47
Fix a typo in an address_set.c comment.
2018-02-12 11:14:34 -05:00
Fernando Fernandez Mancera
eb089ecaa0
Improve the documentation of AccountingStart parameter.
...
Fixes #23635 .
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
2018-02-12 17:10:04 +01:00
Nick Mathewson
4f98ec9fd3
Merge branch 'maint-0.3.2'
2018-02-12 08:33:48 -05:00
Nick Mathewson
021c3bd587
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-12 08:33:47 -05:00
Nick Mathewson
91109bc813
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-12 08:33:47 -05:00
Nick Mathewson
e91bae66d8
Merge branch 'bug23318-redux_029' into maint-0.2.9
2018-02-12 08:33:03 -05:00
Nick Mathewson
019bb55181
Merge branch 'maint-0.3.2'
2018-02-11 18:11:04 -05:00
Nick Mathewson
98fc8cd937
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 18:11:04 -05:00
Nick Mathewson
b2c4d4e7fa
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:11:04 -05:00
Nick Mathewson
84c13336c4
Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
2018-02-11 18:10:59 -05:00
Nick Mathewson
a7f5ece2b9
Merge branch 'maint-0.3.2'
2018-02-11 18:09:35 -05:00
Nick Mathewson
67043d957f
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 18:09:35 -05:00
Nick Mathewson
8939eaf479
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:09:35 -05:00
Nick Mathewson
848ba26c18
Merge branch 'ticket24315_029' into maint-0.2.9
2018-02-11 18:07:37 -05:00
Nick Mathewson
bdc29eaa7e
Merge branch 'maint-0.3.2'
2018-02-11 17:01:00 -05:00
Nick Mathewson
684d57fe8a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 17:00:52 -05:00
Nick Mathewson
eccef6ba60
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 16:51:56 -05:00
Nick Mathewson
5dc785ceef
Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9
2018-02-11 16:51:53 -05:00
Nick Mathewson
a75ae628c7
Merge remote-tracking branch 'isis/bug25127_redux'
2018-02-11 16:17:41 -05:00
Nick Mathewson
7aa94f7441
fix compilation.
2018-02-11 16:16:58 -05:00
Nick Mathewson
3834441a72
chnages file for 25120
2018-02-11 16:14:19 -05:00
Nick Mathewson
627974b02e
Merge branch 'bug25120'
2018-02-11 16:10:58 -05:00
Alexander Færøy
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
Nick Mathewson
4de20d1754
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-10 16:09:01 -05:00
Nick Mathewson
1df701c082
Merge branch 'maint-0.3.2'
2018-02-10 16:09:01 -05:00
Nick Mathewson
86583ad78e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-10 16:09:00 -05:00
Nick Mathewson
320dac4602
Merge branch 'bug24978_029_enable' into maint-0.2.9
2018-02-10 16:08:58 -05:00
Nick Mathewson
791ceb2028
Bump version to 0.3.3.2-alpha-dev
2018-02-10 10:41:23 -05:00
Nick Mathewson
efc1057162
Increment the release date in the changelog.
...
"We fray into the future, rarely wrought
save in the tapestries of afterthought"
-- Richard Wilbur, _Years End_
2018-02-10 09:57:36 -05:00
Isis Lovecruft
45c59eff6c
rust: Replace two unwrap()s in FFI code with unwrap_or()s.
2018-02-10 01:21:31 +00:00
Nick Mathewson
9e0d468498
Bump to 0.3.3.2-alpha
2018-02-09 17:25:58 -05:00
Nick Mathewson
379372b90a
Re-wrap and sort the changelog
2018-02-09 17:25:30 -05:00
Roger Dingledine
416a385fee
final mucking. all yours, nick
2018-02-09 17:24:45 -05:00
Roger Dingledine
3fdd08a174
more changelog cleanup
2018-02-09 17:10:34 -05:00
Roger Dingledine
99666dc6c4
whitespace and typo cleanups
2018-02-09 17:05:20 -05:00
Roger Dingledine
d95c7c7f52
changelog cleanups
2018-02-09 17:04:39 -05:00
Nick Mathewson
6b85ff95a2
Tweak blurb, re-sort changelog
2018-02-09 16:01:45 -05:00
Nick Mathewson
859ae85287
Write a blurb
2018-02-09 16:01:31 -05:00
