summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-06Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-11-06Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9teor
2019-10-29Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-29Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-29Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9teor
2019-10-25Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-25Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-25changes: file for 31919's bionic Travis image changeteor
2019-10-25Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035teor
2019-10-25Travis: Use Ubuntu Bionic, but keep Trusty for chutneyteor
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-24Travis: Use macOS 10.14 with Xcode 11.2teor
Closes ticket 32241.
2019-10-23Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-23Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5teor
2019-10-23Merge branch 'maint-0.2.9' into maint-0.3.5teor
`git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.
2019-10-23Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9teor
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5Nick Mathewson
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-22Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5teor
2019-10-22Travis: Disable the Rust macOS buildteor
This build was added in 0.3.5. We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177.
2019-10-22Merge branch 'ticket32177_029' into ticket32177_035teor
Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.
2019-10-22Travis: Disable all but one macOS buildteor
We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177.
2019-10-21Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-20Appveyor: Use Windows Server 2019teor
Instead of Windows Server 2016. Closes ticket 32086.
2019-10-20test/rebind: Make control formatting and log parsing more robustteor
* actually sleep when tor has not logged anything * log at debug level when waiting for tor to log something * backslash-replace bad UTF-8 characters in logs * format control messages as ASCII: tor does not accept UTF-8 control commands Fixes bug 31837; bugfix on 0.3.5.1-alpha.
2019-10-17Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-17Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-17Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5teor
2019-10-17Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9teor
2019-10-02Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-02Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-10-02Update geoip and geoip6 to the October 1 2019 database.Karsten Loesing
2019-10-01Travis: Keep the macOS Rust job, but don't wait for it to finishteor
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-01Travis: Split jobs, add essential jobs, remove redundant jobsteor
Part of 31859 for 0.3.5.
2019-10-01Merge branch 'bug31859_029' into bug31859_035teor
While merging: * leave out some redundant jobs and build matrix entries
2019-09-30Travis: Add a macOS chutney job, but don't wait for it to finishteor
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-30Travis: Remove a redundant clang Linux jobteor
Part of 31859.
2019-09-30Appveyor: Avoid spurious errors in Appveyor CI buildsteor
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-26Travis: Unroll the build matrix into matrix: include:teor
The jobs should be the same, but Travis may display them differently. Part of 31859.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion