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
b3416476b4
Remove all uses of weak_rng.
...
I'm not removing the weak_rng code itself yet, since it is possible
that we will want to revert one of these.
2019-02-20 12:24:34 -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
4d4eda89a1
Merge branch 'maint-0.4.0'
2019-02-20 10:36:54 -05:00
Roger Dingledine
249319ec5d
fix typos from #28614
2019-02-20 10:32:47 -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
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
Nick Mathewson
c3fca4e4b3
Merge branch 'maint-0.4.0'
2019-02-19 11:51:24 -05:00
Nick Mathewson
4df31adef7
Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0
2019-02-19 11:51:19 -05:00
Nick Mathewson
f70929347f
Merge branch 'maint-0.4.0'
2019-02-19 11:49:24 -05:00
Nick Mathewson
4bc55ed5ee
Merge branch 'bug29145_029' into maint-0.4.0
2019-02-19 11:49:20 -05:00
Kris Katterjohn
4417ac880a
Fix a compiler warning on OpenBSD
...
malloc_options needs to be declared extern (and declaring it extern
means we need to initialize it separately)
Fixes bug 29145; bugfix on 0.2.9.3-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-02-19 11:38:32 -05:00
Nick Mathewson
af36af1a9b
Merge remote-tracking branch 'tor-github/pr/683'
2019-02-19 11:32:33 -05:00
Nick Mathewson
1239e411a7
Merge remote-tracking branch 'tor-github/pr/694'
2019-02-19 11:31:22 -05:00
Nick Mathewson
0db0b4769c
Merge remote-tracking branch 'tor-github/pr/678'
2019-02-19 11:30:27 -05:00
Nick Mathewson
26873bc4ed
Merge branch 'bug28698_035' into maint-0.4.0
2019-02-19 11:27:18 -05:00
José M. Guisado
78220aae1e
Add circuit time check before logging about relaxing circuit time
...
Signed-off-by: José M. Guisado <guigom@riseup.net>
2019-02-19 11:24:51 -05:00
Nick Mathewson
5c87add923
Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0
2019-02-19 11:21:51 -05:00
teor
a798bd40fb
stats: Stop reporting statistics when ExtraInfoStatistics is 0
...
When ExtraInfoStatistics is 0, stop including bandwidth usage statistics,
GeoIPFile hashes, ServerTransportPlugin lines, and bridge statistics
by country in extra-info documents.
Fixes bug 29018; bugfix on 0.2.4.1-alpha (and earlier versions).
2019-02-19 19:01:44 +10:00
teor
361738c964
Merge branch 'bug29017-033' into bug29017-master-merge
2019-02-19 18:59:16 +10:00
rl1987
6fdd34acd6
Remove check-tor script
2019-02-15 19:18:24 +02:00
George Kadianakis
80abe4170d
Update all the histogram functions to use the new design.
2019-02-15 17:43:23 +02:00
Matt Traudt
b054a6c6b9
kist: When readding chans, check correct chan's sched_heap_idx
...
Closes #29508
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-14 16:19:31 -05:00
George Kadianakis
00b073b1bc
Merge branch 'maint-0.3.5'
2019-02-14 18:01:07 +02:00
George Kadianakis
d83c299eba
Merge branch 'tor-github/pr/689' into maint-0.3.5
2019-02-14 18:00:05 +02:00
George Kadianakis
9bfe4ed6dd
Merge branch 'tor-github/pr/536' into maint-0.3.5
2019-02-14 17:39:34 +02:00
George Kadianakis
f5a6d4c6ea
Disable unstable circuit padding unittest.
...
until #29298 is implemented.
2019-02-14 12:09:41 +02:00
Nick Mathewson
5f42bc0f48
Merge remote-tracking branch 'tor-github/pr/699'
2019-02-13 15:19:59 -05:00
Nick Mathewson
5687165cf1
Merge remote-tracking branch 'tor-github/pr/674'
2019-02-13 11:38:35 -05:00
David Goulet
d5de1a0a55
Merge branch 'tor-github/pr/651'
2019-02-13 11:02:02 -05:00
David Goulet
6efc2a0e1f
Merge branch 'tor-github/pr/650' into maint-0.3.5
2019-02-13 10:56:24 -05:00
juga0
b61c3c6dfa
changes: Add changes file for #26698
2019-02-13 12:26:00 +00:00
David Goulet
c320c52e89
Merge branch 'tor-github/pr/690'
2019-02-12 13:04:25 -05:00
David Goulet
95e5f8fe03
Merge branch 'tor-github/pr/671'
2019-02-12 13:02:30 -05:00
Nick Mathewson
72b978c3a5
On windows, if we fail to load a consensus and it has a CRLF, retry.
...
Fixes bug 28614; bugfix on 0.4.0.1-alpha when we started mmapping
the consensus.
2019-02-12 12:57:33 -05:00
Nick Mathewson
a797a69679
Merge branch 'maint-0.3.5'
2019-02-12 09:56:50 -05:00
Nick Mathewson
db209d4dba
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-12 09:56:49 -05:00
Nick Mathewson
7ead2af622
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-12 09:56:49 -05:00
Nick Mathewson
2e770216c4
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-12 09:56:49 -05:00
Karsten Loesing
a3f9ddcf03
Update geoip and geoip6 to the February 5 2019 database.
2019-02-12 14:40:42 +01:00
rl1987
8d04dc416b
Add changes file
2019-02-09 16:56:54 +02:00
Nick Mathewson
f4c76661d1
Add a script to check for coverage nondeterminism
...
Closes ticket 29436.
2019-02-08 11:22:24 -05:00
