644ec835d5
Merge branch 'maint-0.3.2'
2017-12-12 09:13:12 -05:00
4c54021baf
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-12 09:13:12 -05:00
31ce03a2b9
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-12 09:13:12 -05:00
d3b7a2bd27
rename changes file
2017-12-12 09:13:05 -05:00
632d6cbc43
Merge remote-tracking branch 'teor/doc24596'
2017-12-12 09:07:49 -05:00
7b59199663
Fix a typo in CodingStandards.md
...
Closes #24596 .
2017-12-12 12:32:50 +11:00
4593f5a6e1
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:56:31 -05:00
cdee62da9e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:56:31 -05:00
da38904efb
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:56:31 -05:00
a6587e9070
Merge branch 'maint-0.3.2'
2017-12-11 16:56:31 -05:00
eecfed0cd2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:56:31 -05:00
f7151387d9
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:56:31 -05:00
1deda2106b
Merge branch 'bug24167_025' into maint-0.2.5
2017-12-11 16:56:28 -05:00
422ff8f922
Merge branch 'maint-0.3.2'
2017-12-11 16:54:14 -05:00
43fb8fc5cb
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:54:14 -05:00
04524443d0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:54:14 -05:00
2ea573ece8
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:54:14 -05:00
eaaa1108a3
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:54:14 -05:00
bc1ea4f470
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:54:11 -05:00
f5d4bdf305
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
2017-12-11 16:53:02 -05:00
16ec4da68c
Merge branch 'maint-0.3.2'
2017-12-11 16:51:58 -05:00
e553bf3ce4
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:51:58 -05:00
736e7299ce
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:51:58 -05:00
7fcb222ab7
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:51:58 -05:00
7e486dd6f7
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
2017-12-11 16:51:54 -05:00
abcc7032ce
Merge branch 'maint-0.3.2'
2017-12-11 16:50:48 -05:00
bfc9be4c77
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:50:48 -05:00
f7b41bcdf0
Merge branch 'bug24086_031' into maint-0.3.1
2017-12-11 16:49:01 -05:00
828333e38c
Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1
2017-12-11 16:48:44 -05:00
3b2f4d1391
Merge branch 'maint-0.3.2'
2017-12-11 16:46:00 -05:00
dc79d5299d
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:46:00 -05:00
d2031f2c60
Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1
2017-12-11 16:45:54 -05:00
d5400d50e7
Merge branch 'maint-0.3.2'
2017-12-11 16:43:51 -05:00
acc462c965
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:43:48 -05:00
ae608408e9
Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1
2017-12-11 16:43:41 -05:00
8e100d1a17
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid taking the 030 version of 23862.
2017-12-11 16:43:24 -05:00
c55a054236
Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
2017-12-11 16:41:28 -05:00
418d8bbe92
Merge branch 'stack_fixes_032_v2' into maint-0.3.2
2017-12-11 16:25:04 -05:00
35d56a127d
Add a changelog for the STACK fixes
2017-12-11 16:23:11 -05:00
f539d89fd9
Move subtraction in rephist to try to avoid STACK warning
...
(I do not know why this one is happening)
2017-12-11 16:23:11 -05:00
3da15bcbe8
Stop checking for sandbox:new_element() failures: it can't fail.
...
(It can't fail because the tor_malloc*() family of functions can
never return NULL)
Found with STACK
2017-12-11 16:06:25 -05:00
472473ec5d
transport_new() cannot fail; do not check for it to fail.
...
(It can't fail because the tor_malloc*() family of functions can
never return NULL)
Found with STACK.
2017-12-11 16:06:00 -05:00
252db6ad26
Merge branch 'maint-0.3.2'
2017-12-11 16:02:10 -05:00
057139d383
sched: Avoid integer overflow when computing tcp_space
...
In KIST, we could have a small congestion window value than the unacked
packets leading to a integer overflow which leaves the tcp_space value to be
humongous.
This has no security implications but it results in KIST scheduler allowing to
send cells on a potentially saturated connection.
Found by #24423 . Fixes #24590 .
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-12-11 15:45:19 -05:00
ea929e8456
Merge remote-tracking branch 'public/feature24427'
2017-12-11 09:59:46 -05:00
c2822bbc63
Fix compilation of 23459 patch.
...
The free() changes of 23447 had broken the pending 23459 patch.
2017-12-11 09:55:38 -05:00
7803b19c43
Merge remote-tracking branch 'ffmancera/github/bug23459'
2017-12-11 09:53:39 -05:00
030d3d52f5
Merge remote-tracking branch 'teor/comment24575'
2017-12-11 09:46:23 -05:00
98682f689b
Merge branch 'maint-0.3.2'
2017-12-11 09:45:17 -05:00
d68abbe358
Merge remote-tracking branch 'dgoulet/bug23603_032_02' into maint-0.3.2
2017-12-11 09:42:12 -05:00
Nick Mathewson
teor
David Goulet