cec555f44c
Merge branch 'tor-github/pr/720'
2019-02-28 12:32:16 +02:00
761eb4cf79
Merge branch 'maint-0.4.0'
2019-02-27 09:59:42 -05:00
56f01e58b4
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0
2019-02-27 09:59:33 -05:00
64e082e892
Merge branch 'bug29599_029' into bug29599_033
2019-02-27 15:06:39 +10:00
4d9eb4dd0e
test/shared-random: Stop leaking shared random state in the unit tests
...
Stop leaking parts of the shared random state in the shared-random unit
tests.
Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27 15:04:40 +10:00
6c966b894c
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-27 09:37:36 +10:00
39a1049932
Merge branch 'tor-github/pr/729'
2019-02-26 20:15:40 +02:00
b402a0887f
Merge branch 'tor-github/pr/655'
2019-02-26 11:30:44 -05:00
2a44ee9b8c
Merge branch 'maint-0.4.0'
2019-02-26 11:25:16 -05:00
a5dd41b9af
Merge branch 'tor-github/pr/638' into maint-0.4.0
2019-02-26 11:24:43 -05:00
e1ad22643e
maint: Helpful scripts for tor maintenance
...
Closes #29391
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-02-26 10:52:25 -05:00
9c4ec414bd
Merge branch 'tor-github/pr/692' into maint-0.4.0
2019-02-26 10:47:54 -05:00
732855c2e5
Merge branch 'maint-0.4.0'
2019-02-26 07:27:50 -05:00
35257a1c69
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0
2019-02-26 07:27:42 -05:00
57d33b5786
Merge branch 'tor-github/pr/698'
2019-02-26 12:35:14 +02:00
7fbfdf2af7
Merge branch 'tor-github/pr/611'
2019-02-26 12:33:23 +02:00
1b9e77349f
Fix some error-checking logic and a misleading error message
...
When IPv4Only (IPv6Only) was used but the address could not be
interpreted as a IPv4 (IPv6) address, the error message referred
to the wrong IP version.
This also fixes up the error-checking logic so it's more precise
about what's being checked.
Fixes bug 13221; bugfix on 0.2.3.9-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-02-25 16:03:42 -06:00
626e6d2c39
Merge remote-tracking branch 'tor-github/pr/684'
2019-02-25 13:33:39 -05:00
69238ca2da
Merge remote-tracking branch 'tor-github/pr/646'
2019-02-24 17:17:16 -05:00
34601105a3
Merge branch 'ticket29065_squashed'
2019-02-24 17:02:35 -05:00
b7dced893a
Fix shellcheck SC2006 warnings in test_switch_id.sh
2019-02-24 17:02:06 -05:00
df8ad64735
When a DirAuth checks reachability on itself and has IPv6, mark it as reachable
2019-02-22 13:36:02 -05:00
f229a33685
Merge remote-tracking branch 'nickm/thread_rng'
2019-02-22 16:07:57 +02:00
b3b737b875
Update pre-commit.git-hook for ticket 29553
...
- handle older source layout
- handle empty changes directories
- "set -e" so that we exit if there's a problem.
2019-02-21 13:35:33 -05:00
658770a0f0
Remove changes entries for fixes that appeared in 0.4.0.2-alpha
2019-02-21 10:33:16 -05:00
00a93b19cf
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-21 10:08:14 -05:00
54e42fe364
Merge branch 'maint-0.4.0'
2019-02-21 10:08:14 -05:00
4a8a1f76ea
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-21 10:08:14 -05:00
5062647918
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 10:08:14 -05:00
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
59c3910bec
Merge branch 'tor-github/pr/695'
2019-02-20 12:15:26 -05:00
d259194c82
Merge branch 'tor-github/pr/658'
2019-02-20 12:09:52 -05:00
da179088ee
Merge branch 'tor-github/pr/687'
2019-02-20 12:09:02 -05:00
7037fe1163
Merge branch 'tor-github/pr/700'
2019-02-20 12:06:39 -05:00
b7ad8bcaad
Use setrlimit instead of ulimit -c in backtrace tests
2019-02-20 12:06:26 -05:00
8f5a3c0460
Merge branch 'tor-github/pr/675'
2019-02-20 11:45:58 -05:00
a30f17f72f
Merge branch 'tor-github/pr/696'
2019-02-20 11:29:55 -05:00
4d4eda89a1
Merge branch 'maint-0.4.0'
2019-02-20 10:36:54 -05:00
249319ec5d
fix typos from #28614
2019-02-20 10:32:47 -05:00
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
6927e9a60c
Merge remote-tracking branch 'tor-github/pr/665'
2019-02-19 11:56:48 -05:00
0fc5fdc430
Merge remote-tracking branch 'tor-github/pr/659'
2019-02-19 11:55:53 -05:00
97e1539f7f
Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0
2019-02-19 11:53:02 -05:00
c3fca4e4b3
Merge branch 'maint-0.4.0'
2019-02-19 11:51:24 -05:00
4df31adef7
Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0
2019-02-19 11:51:19 -05:00
f70929347f
Merge branch 'maint-0.4.0'
2019-02-19 11:49:24 -05:00
4bc55ed5ee
Merge branch 'bug29145_029' into maint-0.4.0
2019-02-19 11:49:20 -05:00
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
af36af1a9b
Merge remote-tracking branch 'tor-github/pr/683'
2019-02-19 11:32:33 -05:00
1239e411a7
Merge remote-tracking branch 'tor-github/pr/694'
2019-02-19 11:31:22 -05:00
George Kadianakis
Nick Mathewson
teor
David Goulet
Kris Katterjohn
rl1987
Neel Chauhan
Roger Dingledine