Nick Mathewson
a4ab273a0d
Merge remote-tracking branch 'fristonio/ticket-25261'
2018-02-20 10:03:52 -05:00
Nick Mathewson
5c48f62e67
Merge branch 'maint-0.3.3'
2018-02-16 08:49:08 -05:00
Nick Mathewson
9f1899fdfd
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-02-16 08:49:08 -05:00
Nick Mathewson
c67adddacb
Remove changes file for 24898-029 backports in maint-0.3.2
...
These patches were already merged, and so don't need a changes file
in these branches.
2018-02-16 08:48:46 -05:00
Nick Mathewson
1527032384
Merge branch 'maint-0.3.3'
2018-02-16 08:47:41 -05:00
Nick Mathewson
8970058af6
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-02-16 08:47:41 -05:00
Nick Mathewson
c8b087d901
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-16 08:47:41 -05:00
Roger Dingledine
d21e5cfc24
stop calling channel_mark_client in response to a create_fast
...
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]
2018-02-16 08:46:57 -05:00
Neel Chauhan
c2fa743806
Remove the return value of node_get_prim_orport() and node_get_prim_dirport()
2018-02-16 08:20:33 -05:00
Nick Mathewson
b56fd17d00
Merge branch 'maint-0.3.3'
2018-02-15 21:05:12 -05:00
Nick Mathewson
d662d4470a
Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into maint-0.3.3
2018-02-15 21:05:08 -05:00
Nick Mathewson
d9804691df
Merge remote-tracking branch 'ffmancera-1/bug18918'
2018-02-15 21:00:10 -05:00
Nick Mathewson
92a42f795c
Merge branch 'bug23909'
2018-02-15 20:56:23 -05:00
Nick Mathewson
8da6bfa5de
Merge branch 'bug24914'
2018-02-15 20:53:50 -05:00
Nick Mathewson
ed1d630f0e
Merge branch 'onion_ntor_malloc_less'
2018-02-15 20:40:03 -05:00
Nick Mathewson
a1dd8afc16
Merge branch '25162_zstd_static'
2018-02-15 20:28:07 -05:00
Nick Mathewson
3ca04aada2
Merge remote-tracking branch 'valentecaio/t-25081'
2018-02-15 20:23:23 -05:00
Nick Mathewson
3d7bf98d13
Merge remote-tracking branch 'valentecaio/t-24714'
2018-02-15 20:19:53 -05:00
Nick Mathewson
3c8a481599
Merge branch 'bug18105'
2018-02-15 20:17:31 -05:00
Nick Mathewson
3e2b48f8b4
Merge branch 'bug24484_squashed'
2018-02-15 20:13:53 -05:00
Nick Mathewson
4dc228e35b
Remove workaround code for systems where free(NULL) is busted.
...
Add an autoconf test to make sure we won't regret it.
Closes ticket 24484.
2018-02-15 20:13:44 -05:00
Deepesh Pathak
3553383312
ticket 25261: Removed multiple includes of transports.h in connection.c
2018-02-15 22:28:34 +05:30
Nick Mathewson
f6a230ec95
Merge remote-tracking branch 'mikeperry/bug24769'
2018-02-14 10:03:14 -05:00
Nick Mathewson
9e566f3a72
Merge branch 'tests_rust'
2018-02-13 18:12:01 -05:00
Nick Mathewson
cb9a322b67
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-13 16:55:19 -05:00
Nick Mathewson
f647035b37
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-13 16:55:18 -05:00
Taylor Yu
f0ed7895ca
fix make check-changes
2018-02-13 15:07:55 -06:00
Nick Mathewson
86f461e362
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
2018-02-13 15:00:43 -05:00
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
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
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
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
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
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
3834441a72
chnages file for 25120
2018-02-11 16:14:19 -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
