George Kadianakis
7fbfdf2af7
Merge branch 'tor-github/pr/611'
2019-02-26 12:33:23 +02:00
Nick Mathewson
626e6d2c39
Merge remote-tracking branch 'tor-github/pr/684'
2019-02-25 13:33:39 -05:00
Nick Mathewson
69238ca2da
Merge remote-tracking branch 'tor-github/pr/646'
2019-02-24 17:17:16 -05:00
Nick Mathewson
34601105a3
Merge branch 'ticket29065_squashed'
2019-02-24 17:02:35 -05:00
rl1987
b7dced893a
Fix shellcheck SC2006 warnings in test_switch_id.sh
2019-02-24 17:02:06 -05:00
George Kadianakis
f229a33685
Merge remote-tracking branch 'nickm/thread_rng'
2019-02-22 16:07:57 +02:00
Nick Mathewson
9ac8c85435
Merge branch 'maint-0.4.0'
...
"ours" to avoid version bump.
2019-02-21 13:25:54 -05:00
Nick Mathewson
1bff5646e6
Bump to 0.4.0.2-alpha-dev
2019-02-21 13:25:33 -05:00
Nick Mathewson
5f44e1e5dc
Merge branch 'maint-0.3.5' into maint-0.4.0
...
"ours" to avoid version bump.
2019-02-21 13:25:02 -05:00
Nick Mathewson
955ca72f95
Bump to 0.3.5.8-dev
2019-02-21 13:24:42 -05:00
Nick Mathewson
e1079266e7
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump.
2019-02-21 13:23:52 -05:00
Nick Mathewson
a56b9501f1
Bump to 0.3.4.11-dev
2019-02-21 13:23:46 -05:00
Nick Mathewson
df70c44960
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" to avoid version bump
2019-02-21 13:23:22 -05:00
Nick Mathewson
fb309f6eba
Bump to 0.3.3.12-dev
2019-02-21 13:22:56 -05:00
Nick Mathewson
658770a0f0
Remove changes entries for fixes that appeared in 0.4.0.2-alpha
2019-02-21 10:33:16 -05:00
Nick Mathewson
85e1c49378
Copy today's releases into changelogs and releasenotes.
2019-02-21 10:32:08 -05:00
Nick Mathewson
00a93b19cf
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-21 10:08:14 -05:00
Nick Mathewson
4a8a1f76ea
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-21 10:08:14 -05:00
Nick Mathewson
5062647918
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 10:08:14 -05:00
Nick Mathewson
54e42fe364
Merge branch 'maint-0.4.0'
2019-02-21 10:08:14 -05:00
David Goulet
be84ed1a64
kist: Don't write above the highwater outbuf mark
...
KIST works by computing how much should be allowed to write to the kernel for
a given socket, and then it writes that amount to the outbuf.
The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.
This commit makes it for KIST to take into account the outbuf length when
computing the available space.
Bug found and patch by Rob Jansen.
Closes #29168 . TROVE-2019-001.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-21 10:07:34 -05:00
Nick Mathewson
d04f6d9dff
Merge branch 'maint-0.4.0'
...
"ours" to avoid version bump
2019-02-21 09:52:35 -05:00
Nick Mathewson
df3484b2b0
Bump version to 0.4.0.2-alpha
2019-02-21 09:52:27 -05:00
Nick Mathewson
332fe15679
Merge branch 'maint-0.3.5' into maint-0.4.0
...
"ours" to avoid version bump.
2019-02-21 09:51:38 -05:00
Nick Mathewson
c663716b67
Bump to 0.3.5.8
2019-02-21 09:51:29 -05:00
Nick Mathewson
46910c060f
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump.
2019-02-21 09:50:46 -05:00
Nick Mathewson
508002a4c2
Bump to 0.3.4.11
2019-02-21 09:50:22 -05:00
Nick Mathewson
7614a8b612
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 09:49:56 -05:00
Nick Mathewson
41c2bf590b
Update to 0.3.3.12
2019-02-21 09:49:48 -05:00
Nick Mathewson
aa79196ee0
Merge branch 'maint-0.4.0'
2019-02-21 09:10:34 -05:00
Nick Mathewson
34183f0d71
Fix a goofy change from abcde10fce that broke test-slow linking
...
boklm tracked this down, and it doesn't make sense. It caused
This change goes back to the previous LDFLAGS line.
2019-02-21 09:10:15 -05:00
David Goulet
59c3910bec
Merge branch 'tor-github/pr/695'
2019-02-20 12:15:26 -05:00
David Goulet
d259194c82
Merge branch 'tor-github/pr/658'
2019-02-20 12:09:52 -05:00
David Goulet
da179088ee
Merge branch 'tor-github/pr/687'
2019-02-20 12:09:02 -05:00
David Goulet
7037fe1163
Merge branch 'tor-github/pr/700'
2019-02-20 12:06:39 -05:00
rl1987
b7ad8bcaad
Use setrlimit instead of ulimit -c in backtrace tests
2019-02-20 12:06:26 -05:00
David Goulet
8f5a3c0460
Merge branch 'tor-github/pr/675'
2019-02-20 11:45:58 -05:00
David Goulet
a30f17f72f
Merge branch 'tor-github/pr/696'
2019-02-20 11:29:55 -05:00
Roger Dingledine
c22446e305
Merge branch 'maint-0.4.0'
2019-02-20 10:40:20 -05:00
Roger Dingledine
5ec65be8bf
Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0
2019-02-20 10:39:28 -05:00
Roger Dingledine
4d4eda89a1
Merge branch 'maint-0.4.0'
2019-02-20 10:36:54 -05:00
Roger Dingledine
ccab4347e5
Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0
2019-02-20 10:35:56 -05:00
Roger Dingledine
249319ec5d
fix typos from #28614
2019-02-20 10:32:47 -05:00
Nick Mathewson
208f04e9b8
Add a quick test for get_thread_fast_rng()
2019-02-19 15:36:11 -05:00
Nick Mathewson
b25cd5cfe1
Implement code to manage a per-thread instance of crypto_fast_rng()
...
The subsystems API makes this really simple, fortunately.
Closes ticket 29536
2019-02-19 15:36:08 -05:00
Nick Mathewson
d32e407976
Downgrade some LOG_ERR messages in the address/* tests to warnings
...
Fixes bug 29530, where the LOG_ERR messages were occurring when
we had no configured network, and so we were failing the unit tests
because of the recently-merged #28668 .
Bug not in any released Tor.
2019-02-19 14:02:32 -05:00
Nick Mathewson
c9ff6a7f83
Mark map_anon_nofork test as skipped in 0.4.0
...
This test fails in some environments; since the code isn't used in
0.4.0, let's disable it for now.
Band-aid solution for #29534 ; bug not in any released Tor.
2019-02-19 13:14:26 -05:00
Nick Mathewson
6927e9a60c
Merge remote-tracking branch 'tor-github/pr/665'
2019-02-19 11:56:48 -05:00
Nick Mathewson
0fc5fdc430
Merge remote-tracking branch 'tor-github/pr/659'
2019-02-19 11:55:53 -05:00
Nick Mathewson
97e1539f7f
Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0
2019-02-19 11:53:02 -05:00
