ff601da0d1
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-29 08:26:44 +10:00
54e2d0dc2d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-29 08:26:40 +10:00
15d67842f9
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-29 08:26:32 +10:00
752c35ca96
Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9
2019-10-29 08:23:35 +10:00
d945a88945
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-25 10:56:02 +10:00
e56e7e865e
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-25 10:55:58 +10:00
e03db9934a
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-25 10:55:51 +10:00
93be7275ec
changes: file for 31919's bionic Travis image change
2019-10-25 09:53:11 +10:00
1eb57b20b9
Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035
2019-10-25 09:48:14 +10:00
8e549dd562
Travis: Use Ubuntu Bionic, but keep Trusty for chutney
...
Bionic has a recent coccinelle version, which passes our CI tests.
But Bionic (and Xenial) cause permissions errors for chutney.
We'll fix those in 32240.
Part of 31919.
2019-10-25 09:45:36 +10:00
14b197a148
Travis: Use macOS 10.14 with Xcode 11.2
...
Closes ticket 32241.
2019-10-24 11:44:43 +10:00
d4d189964a
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-23 08:47:12 +10:00
57acdaa3f1
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-23 08:47:08 +10:00
d175e70817
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-23 08:47:01 +10:00
641f130447
Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0
2019-10-23 08:35:17 +10:00
c77162e4e9
Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5
2019-10-23 08:32:52 +10:00
8682442c76
Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9
2019-10-23 08:32:22 +10:00
27965f1ef2
Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5
2019-10-23 08:30:48 +10:00
003be727c4
Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5
2019-10-23 08:28:03 +10:00
1ea19d7a5b
Merge branch 'maint-0.2.9' into maint-0.3.5
...
`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.
2019-10-23 08:25:42 +10:00
7660a7cf7d
Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9
2019-10-23 08:20:45 +10:00
2da3e3f709
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-22 12:10:30 -04:00
4013e50cb7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 12:10:30 -04:00
21c3488af7
Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
2019-10-22 12:10:08 -04:00
af3ab180bf
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-22 20:48:09 +10:00
9bb0ca122f
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 20:48:05 +10:00
bed4390133
Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5
2019-10-22 20:47:44 +10:00
4c4a0d50ff
Travis: Disable the Rust macOS build
...
This build was added in 0.3.5.
We need to mitigate slow scheduling of Travis macOS jobs.
Closes ticket 32177.
2019-10-22 19:42:45 +10:00
92ad87b808
Merge branch 'ticket32177_029' into ticket32177_035
...
Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.
2019-10-22 19:42:23 +10:00
511aeba8ee
Travis: Disable all but one macOS build
...
We need to mitigate slow scheduling of Travis macOS jobs.
Closes ticket 32177.
2019-10-22 19:35:43 +10:00
f05cfda3e2
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-21 18:44:44 -04:00
89ead08eef
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-21 18:44:44 -04:00
f420b60c19
Appveyor: Use Windows Server 2019
...
Instead of Windows Server 2016.
Closes ticket 32086.
2019-10-20 22:04:08 +10:00
3ab58706f7
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-17 14:52:02 +10:00
e483257e1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-17 14:51:58 +10:00
4b8e5ea0dc
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-17 14:51:50 +10:00
702aa8f775
Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5
2019-10-17 14:50:28 +10:00
c660f47960
Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9
2019-10-17 14:49:52 +10:00
c7d3bedf31
Merge branch 'maint-0.4.0' into release-0.4.0
2019-10-02 08:01:34 -04:00
a74c180691
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-02 08:01:34 -04:00
7b9cb4c47b
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-02 08:01:33 -04:00
90de776ea9
Update geoip and geoip6 to the October 1 2019 database.
2019-10-02 11:11:27 +02:00
632e707397
Travis: Keep the macOS Rust job, but don't wait for it to finish
...
Since Rust on macOS is slow, don't wait for the macOS Rust job to finish.
Instead, split rust into slow rust (macOS) and fast rust (Linux). And
allow the build to finish before slow rust finishes.
Also make sure that we have:
* a Rust build on each platform,
* a Rust build with each compiler, and
* a check on all our Rust builds.
Finally, sort builds: allow fail last, macOS first, slowest first.
Closes 31859 for 0.3.5.
2019-10-01 23:42:51 +10:00
4482d6fde5
Travis: Split jobs, add essential jobs, remove redundant jobs
...
Part of 31859 for 0.3.5.
2019-10-01 17:32:09 +10:00
f368f5bc37
Merge branch 'bug31859_029' into bug31859_035
...
While merging:
* leave out some redundant jobs and build matrix entries
2019-10-01 17:31:55 +10:00
1e0e23c1e4
Travis: Add a macOS chutney job, but don't wait for it to finish
...
Since Travis macOS has IPv6 support (and Travis Linux does not), chutney
will now run its IPv6 networks as part of Travis CI.
But since chutney is slow, don't wait for the macOS chutney to finish.
(Travis have fixed the duplicate notification bug in fast_finish. So we
can use fast_finish and allow_failure to finish early. Unfortunately,
allow_failure also means we ignore failures in macOS chutney.)
Also make sure that we have:
* a compile on each platform, with each compiler,
* a check on each platform, and
* a check on each compiler.
Finally, sort builds: allow fail last, macOS first, slowest first.
Closes ticket 30860.
Closes ticket 31859 for 0.2.9.
2019-09-30 23:58:38 +10:00
4e4297830e
Travis: Remove a redundant clang Linux job
...
Part of 31859.
2019-09-30 23:58:24 +10:00
b186418792
Appveyor: Avoid spurious errors in Appveyor CI builds
...
When Appveyor fails before the install step, some of the finish step's
functions were not defined.
Fixes bug 31884; bugfix on 0.3.4.2-alpha.
2019-09-30 15:14:21 +10:00
8520071f23
Travis: Unroll the build matrix into matrix: include:
...
The jobs should be the same, but Travis may display them differently.
Part of 31859.
2019-09-26 18:06:09 +10:00
246fdd8742
Merge branch 'ticket31372_035' into ticket31372_040
2019-09-24 08:02:44 -04:00
teor
Nick Mathewson
Karsten Loesing