6428fa3592
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-06 09:33:33 +10:00
8b3b605a15
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-06 09:33:28 +10:00
3b9e3cca94
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-06 09:33:20 +10:00
48e990359b
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-06 09:33:11 +10:00
316aed502e
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
2019-04-06 09:32:53 +10:00
ea5e371822
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
2019-04-06 09:31:52 +10:00
44ea341117
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
2019-04-06 09:30:52 +10:00
102178e6d4
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
2019-04-06 09:30:04 +10:00
a0db5ade3e
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
2019-04-06 09:28:58 +10:00
e1955a2c54
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
2019-04-06 09:28:13 +10:00
8a158b82ba
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 16:45:36 +03:00
071a000d67
Merge branch 'tor-github/pr/906' into maint-0.4.0
2019-04-05 16:44:59 +03:00
0ba45b2977
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 14:57:06 +03:00
2cc3c98bc4
Merge branch 'tor-github/pr/901' into maint-0.4.0
2019-04-05 14:56:52 +03:00
5ac2878770
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 14:55:22 +03:00
7fe169a500
Merge branch 'tor-github/pr/879' into maint-0.4.0
2019-04-05 14:55:09 +03:00
f9f6718c50
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 14:53:39 +03:00
217db9efe1
Merge branch 'tor-github/pr/902' into maint-0.4.0
2019-04-05 14:53:33 +03:00
4bc88a266a
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 14:51:33 +03:00
747b74c182
Merge branch 'tor-github/pr/800' into maint-0.4.0
2019-04-05 14:51:21 +03:00
db71bceb40
Merge branch 'bug29036-29962-034' into bug29036-29962-035
2019-04-05 12:58:32 +10:00
a514e02476
Merge branch 'bug29036-029' into bug29036-29962-034
2019-04-05 12:58:16 +10:00
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
da678213e0
circuitpadding: comment fixes
2019-04-05 12:17:21 +10:00
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
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
28db7646ba
Changes file for bug 29500.
2019-04-05 12:14:18 +10:00
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
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
8a010c8b83
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-04 20:27:04 -04:00
d016bbaa7d
Merge branch 'bug29959_040_squashed' into maint-0.4.0
2019-04-04 20:26:47 -04:00
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
d194f6bedf
Implement an DormantCanceledByStartup option
...
Closes ticket 29357, and comes with appropriate notions of caution.
2019-04-04 11:48:36 -04:00
db1c1dba34
Merge branch 'bug30021_029' into bug30021_035
2019-04-04 11:26:33 -04:00
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
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
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
de0babab9b
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-03 17:59:46 +03:00
42aae0e693
Merge branch 'tor-github/pr/867' into maint-0.4.0
2019-04-03 17:59:02 +03:00
33e0c03103
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-03 17:55:41 +03:00
828f1829c8
Merge branch 'tor-github/pr/811' into maint-0.4.0
2019-04-03 17:50:49 +03:00
eb3b4dcd79
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-03 09:27:44 -04:00
de76862fd6
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-03 09:27:44 -04:00
4aa02d3c7a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-03 09:27:43 -04:00
3cfcfbac46
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-03 09:27:42 -04:00
54e249e269
Update geoip and geoip6 to the April 2 2019 database.
2019-04-03 09:26:28 +02:00
9452833fc3
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-02 11:45:35 +10:00
9242f32883
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-02 11:45:31 +10:00
0418d4081a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-02 11:45:22 +10:00
74775b2dfd
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-02 11:45:13 +10:00
teor
George Kadianakis
Mike Perry
Nick Mathewson
Karsten Loesing