teor
f213a35b2f
Merge branch 'maint-0.4.0'
2019-04-06 09:33:38 +10:00
teor
8b3b605a15
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-06 09:33:28 +10:00
teor
3b9e3cca94
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-06 09:33:20 +10:00
teor
48e990359b
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-06 09:33:11 +10:00
teor
316aed502e
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
2019-04-06 09:32:53 +10:00
teor
ea5e371822
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
2019-04-06 09:31:52 +10:00
teor
44ea341117
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
2019-04-06 09:30:52 +10:00
teor
102178e6d4
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
2019-04-06 09:30:04 +10:00
teor
a0db5ade3e
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
2019-04-06 09:28:58 +10:00
teor
e1955a2c54
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
2019-04-06 09:28:13 +10:00
Nick Mathewson
f021ca2d52
practracker: allow config.c to be a touch larger.
2019-04-05 09:59:45 -04:00
George Kadianakis
df4e2c42a8
Merge branch 'tor-github/pr/907'
2019-04-05 16:45:55 +03:00
George Kadianakis
071a000d67
Merge branch 'tor-github/pr/906' into maint-0.4.0
2019-04-05 16:44:59 +03:00
George Kadianakis
5584b6392d
Merge branch 'maint-0.4.0'
2019-04-05 14:57:06 +03:00
George Kadianakis
2cc3c98bc4
Merge branch 'tor-github/pr/901' into maint-0.4.0
2019-04-05 14:56:52 +03:00
George Kadianakis
76f1763976
Merge branch 'maint-0.4.0'
2019-04-05 14:55:22 +03:00
George Kadianakis
7fe169a500
Merge branch 'tor-github/pr/879' into maint-0.4.0
2019-04-05 14:55:09 +03:00
George Kadianakis
3393c8d510
Merge branch 'maint-0.4.0'
2019-04-05 14:53:39 +03:00
George Kadianakis
217db9efe1
Merge branch 'tor-github/pr/902' into maint-0.4.0
2019-04-05 14:53:33 +03:00
George Kadianakis
b371ea5b0e
Merge branch 'tor-github/pr/761'
2019-04-05 14:52:36 +03:00
George Kadianakis
574c207670
Merge branch 'maint-0.4.0'
2019-04-05 14:51:33 +03:00
George Kadianakis
747b74c182
Merge branch 'tor-github/pr/800' into maint-0.4.0
2019-04-05 14:51:21 +03:00
teor
db71bceb40
Merge branch 'bug29036-29962-034' into bug29036-29962-035
2019-04-05 12:58:32 +10:00
teor
a514e02476
Merge branch 'bug29036-029' into bug29036-29962-034
2019-04-05 12:58:16 +10:00
teor
f0cd8f804f
Makefile: actually, don't delete the gcno files
...
We need to keep the gcno files, because they are created at compile time.
2019-04-05 12:56:29 +10:00
teor
e992c5e4bc
Merge branch 'bug29500_040_monoinit_revert' into bug29500_master_monoinit
...
Apply data structure changes between 0.4.0 and 0.4.1.
2019-04-05 12:24:20 +10:00
teor
593b33608d
Revert "test/circuitpadding: Delete circuitpadding_circuitsetup_machine()"
...
This reverts commit 387d9448de
2019-04-05 12:22:18 +10:00
teor
da678213e0
circuitpadding: comment fixes
2019-04-05 12:17:21 +10:00
teor
387d9448de
test/circuitpadding: Delete circuitpadding_circuitsetup_machine()
...
This test was disabled in 0.4.0 and later, but the fix in #29298 was only
merged to 0.4.1. So this test will never be re-enabled in 0.4.0.
Part of 29500.
2019-04-05 12:17:10 +10:00
Mike Perry
b733044f7a
Bug #29500 : Fix monotime mocking in circpad unittests.
...
Our monotime mocking forces us to call monotime_init() *before* we set the
mocked time value. monotime_init() thus stores the first ratchet value at
whatever the platform is at, and then we set fake mocked time to some later
value.
If monotime_init() gets a value from the host that is greater than what we
choose to mock time at for our unittests, all subsequent monotime_abosolute()
calls return zero, which breaks all unittests that depend on time moving
forward by updating mocked monotime values.
So, we need to adjust our mocked time to take the weird monotime_init() time
into account, when we set fake time.
2019-04-05 12:15:55 +10:00
Mike Perry
28db7646ba
Changes file for bug 29500.
2019-04-05 12:14:18 +10:00
Mike Perry
b027b06dbb
Bug 29500: Start monotime at 1000 nsec.
...
Hopefully this will stop monotime_absolute_usec() from returning 0 on some
platforms in the tests.
2019-04-05 12:14:11 +10:00
Mike Perry
1f48c6cd83
Bug 29500: Attempt to fix the tokens test.
...
Cancel the padding timer by changing order of sent vs recv (sent cancels).
2019-04-05 12:13:19 +10:00
Nick Mathewson
1779878f9e
Merge remote-tracking branch 'tor-github/pr/752'
2019-04-04 20:39:36 -04:00
Nick Mathewson
0e7b34354a
Merge branch 'maint-0.4.0'
2019-04-04 20:27:04 -04:00
Nick Mathewson
d016bbaa7d
Merge branch 'bug29959_040_squashed' into maint-0.4.0
2019-04-04 20:26:47 -04:00
teor
8e961b2174
bwauth: Actually include the bandwidth-file-digest in authority votes
...
Fixes bug 29959; bugfix on 0.4.0.2-alpha.
2019-04-04 20:26:09 -04:00
Nick Mathewson
76912bf140
Use an enum for inherit_result_out.
2019-04-04 12:56:52 -04:00
Nick Mathewson
8c06f02c94
Syntax fix in test.
2019-04-04 12:56:52 -04:00
Nick Mathewson
027c536598
rename inherit values to avoid conflict with system defines
2019-04-04 12:56:52 -04:00
Nick Mathewson
785c3f84de
fast_rng: if noinherit has failed, then check getpid() for bad forks
...
getpid() can be really expensive sometimes, and it can fail to
detect some kind of fork+prng mistakes, so we need to avoid it if
it's safe to do so.
This patch might slow down fast_prng a lot on any old operating
system that lacks a way to prevent ram from being inherited, AND
requires a syscall for any getpid() calls. But it should make sure
that we either crash or continue safely on incorrect fork+prng usage
elsewhere in the future.
2019-04-04 12:56:52 -04:00
Nick Mathewson
361e955cf3
map_anon: define a macro if it is possible for noinherit to fail.
2019-04-04 12:56:52 -04:00
Nick Mathewson
12205c3cbe
Make map_anon expose the result of a noinherit attempt
...
Previously we did this for tests only, but it's valuable for getting
proper fork behavior in rand_fast.
2019-04-04 12:56:52 -04:00
Nick Mathewson
ab6ad3c040
Drop thread-local fast_rng on fork.
...
This will cause the child process to construct a new one in a nice
safe way.
Closes ticket 29668; bug not in any released Tor.
2019-04-04 12:56:52 -04:00
Nick Mathewson
d194f6bedf
Implement an DormantCanceledByStartup option
...
Closes ticket 29357, and comes with appropriate notions of caution.
2019-04-04 11:48:36 -04:00
Nick Mathewson
db1c1dba34
Merge branch 'bug30021_029' into bug30021_035
2019-04-04 11:26:33 -04:00
Nick Mathewson
1710f4bbd6
Do not cache bogus results from classifying client ciphers
...
When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache the result. Previously,
we had cached the unavailability of the cipher list and never looked
again, which in turn led us to assume that the client only supported
the ancient V1 link protocol. This, in turn, was causing Stem
integration tests to stall in some cases. Fixes bug 30021; bugfix
on 0.2.4.8-alpha.
2019-04-04 11:24:55 -04:00
teor
ef06ef217a
Merge branch 'bug30011_035' into bug30011_040
...
Merge bug30011 new package timelimit with 0.4.0 new package shellcheck.
Move shellcheck into the correct category.
2019-04-04 13:23:26 +10:00
teor
3fa42d599a
Travis: Terminate test-stem if it takes more than 9.5 minutes to run
...
(Travis terminates the job after 10 minutes of no output.)
Diagnostic for 29437.
Fixes bug 30011; bugfix on 0.3.5.4-alpha.
2019-04-04 13:21:35 +10:00
George Kadianakis
0b6769a99e
Merge branch 'maint-0.4.0'
2019-04-03 17:59:46 +03:00
