torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
32,867 Commits 53 Branches 631 Tags
e5bce3a74eddf7a55f357664629b520ff3b6c05d
Commit Graph

32867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
teor e5bce3a74e Merge branch 'maint-0.4.1' into release-0.4.1 2019-10-17 14:52:10 +10:00
teor 400e31ad19 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-17 14:52:06 +10:00
teor e483257e1b Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-17 14:51:58 +10:00
teor 4b8e5ea0dc Merge branch 'maint-0.2.9' into maint-0.3.5 2019-10-17 14:51:50 +10:00
teor 13daf339a9 Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1 2019-10-17 14:51:02 +10:00
teor 702aa8f775 Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5 2019-10-17 14:50:28 +10:00
teor c660f47960 Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9 2019-10-17 14:49:52 +10:00
Nick Mathewson f33d5b29e6 Merge branch 'maint-0.4.1' into release-0.4.1 2019-10-02 08:01:34 -04:00
Nick Mathewson a74c180691 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-02 08:01:34 -04:00
Nick Mathewson 4dcbbe4166 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-02 08:01:34 -04:00
Nick Mathewson 7b9cb4c47b Merge branch 'maint-0.2.9' into maint-0.3.5 2019-10-02 08:01:33 -04:00
Karsten Loesing 90de776ea9 Update geoip and geoip6 to the October 1 2019 database. 2019-10-02 11:11:27 +02:00
teor e5dda7f664 Merge branch 'bug31859_040' into bug31859_041 
Merge TOR_TEST_RNG_SEED in maint-0.4.1 into the coverage line
from bug31859_040.
 2019-10-01 23:50:24 +10:00
teor 07db4141ab Merge branch 'bug31859_035' into bug31859_040 2019-10-01 23:46:28 +10:00
teor 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
teor 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
teor 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
teor 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
teor 4e4297830e Travis: Remove a redundant clang Linux job 
Part of 31859.
 2019-09-30 23:58:24 +10:00
teor 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
Nick Mathewson 124d8ec7b2 Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-19 08:52:59 -04:00
Nick Mathewson 6f3f93d86c bump to 0.4.1.6-dev 2019-09-19 08:52:15 -04:00
Nick Mathewson c752b1b43a copy 0.4.1.6 block into releasenotes 2019-09-19 08:38:05 -04:00
Nick Mathewson d10abc0929 Set the date for the 0.4.1.6 release. tor-0.4.1.6 2019-09-19 08:08:39 -04:00
Nick Mathewson 3c248f7866 Fold three more entries into changelog. 2019-09-18 08:15:19 -04:00
Nick Mathewson 8136ebba26 Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-18 08:07:56 -04:00
Nick Mathewson 70bcff6010 Merge branch 'bug31772_041' into maint-0.4.1 2019-09-18 08:07:50 -04:00
Nick Mathewson 84fc0c579b Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 21:28:38 -04:00
Nick Mathewson 5f00c03ed0 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 21:28:38 -04:00
Nick Mathewson 9e674d0eb4 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-09-17 21:28:37 -04:00
Nick Mathewson 02840169d8 Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5 2019-09-17 21:28:29 -04:00
Nick Mathewson 077c716504 Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 21:26:32 -04:00
Nick Mathewson c3e94a8ccd Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 21:26:32 -04:00
Nick Mathewson a1f97bb253 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-09-17 21:26:31 -04:00
Nick Mathewson 50b45c43eb Merge branch 'maint-0.2.9' into maint-0.3.5 2019-09-17 21:26:31 -04:00
Nick Mathewson 967460389a Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9 2019-09-17 21:26:17 -04:00
Nick Mathewson 25af8ada30 Correct the syntax description for the MAPADDRESS command. 
In 0.4.1.1-alpha I introduced a bug where we would require and
ignore a single positional argument.

Fixes bug 31772.
 2019-09-17 19:26:45 -04:00
Nick Mathewson b8628ac2a7 Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 19:12:19 -04:00
Nick Mathewson a3342b382a Bump version to 0.4.1.6 2019-09-17 19:11:56 -04:00
Nick Mathewson cda7f4d8bd Start a changelog for 0.4.1.6 2019-09-17 19:11:27 -04:00
Nick Mathewson ca5e2caf53 Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 19:05:04 -04:00
Nick Mathewson c6f7943269 Merge branch 'bug31570_041' into maint-0.4.1 2019-09-17 19:04:25 -04:00
Nick Mathewson a32646c2ed Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 18:58:44 -04:00
Nick Mathewson 50f981719f Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 18:58:44 -04:00
Nick Mathewson ef35435584 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-09-17 18:58:43 -04:00
Nick Mathewson dc41e6a80c Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 2019-09-17 18:58:06 -04:00
Nick Mathewson 2ebe1fcd52 Merge branch 'maint-0.2.9' into maint-0.3.5 
"ours" merge to avoid picking up 0.2.9 version of ticket 31673.
 2019-09-17 18:57:49 -04:00
Nick Mathewson c76907b54d Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 18:56:52 -04:00
Nick Mathewson cec42be570 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 18:56:52 -04:00
Nick Mathewson ece35992ac Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 18:55:18 -04:00