2ff706ba02
Make configure log messages less confusing during static builds
...
Closes #24558 .
2017-12-12 12:43:53 +11: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
58e8094816
Fix compilation with --disable-memory-sentinels
...
We'd broken this with the recent _free() rewrite.
2017-12-11 08:01:54 -05:00
35055cfa7f
Update the comment in options_transition_affects_guards()
...
It referred to the an old function name.
Fixes #24575 , bugfix on 0.3.0.
2017-12-11 03:18:48 +11:00
241b676638
Fix up test_circuitstats to use the new circuit_free macro
2017-12-08 17:52:45 -05:00
0340c02975
Merge remote-tracking branch 'mikeperry/bug23114_squashed2'
2017-12-08 17:50:34 -05:00
b189c613bb
move a macro; fix a build?
2017-12-08 15:11:18 -05:00
5ee0cccd49
Merge branch 'macro_free_v2_squashed'
2017-12-08 14:58:43 -05:00
7ca5f4bf03
document our allocator conventions
2017-12-08 14:47:19 -05:00
fa0d24286b
Convert remaining function (mostly static) to new free style
2017-12-08 14:47:19 -05:00
17dcce3fe1
Fix wide lines introduced by previous patch.
2017-12-08 14:47:19 -05:00
285632a61b
Replace all FREE_AND_NULL* uses to take a type and a free function.
...
This commit was made mechanically by this perl script:
\#!/usr/bin/perl -w -i -p
next if /^#define FREE_AND_NULL/;
s/\bFREE_AND_NULL\((\w+),/FREE_AND_NULL\(${1}_t, ${1}_free_,/;
s/\bFREE_AND_NULL_UNMATCHED\(/FREE_AND_NULL\(/;
2017-12-08 14:47:19 -05:00
95531ddfbf
Let's have only one FREE_AND_NULL variant.
...
This commit removes the old FREE_AND_NULL, and renames the old
FREE_AND_NULL_UNMATCHED so that it is now called FREE_AND_NULL.
This will break all the FREE_AND_NULL_* users; the next commit will
fix them.
2017-12-08 14:47:19 -05:00
5508ee29d5
changes file for big free macro-ization branch
2017-12-08 14:47:19 -05:00
teor
Nick Mathewson
David Goulet