summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-23Merge branch 'pr1450_squashed' into maint-0.4.1teor
2019-10-23Authorities reject relays running unsupported Tor release series.Nick Mathewson
Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1, 0.3.2, 0.3.3, and 0.3.4 are now rejected. Also, extract this version-checking code into a new function, so we can test it. Closes ticket 31549. Also reject 0.3.5.0 through 0.3.5.6-rc as unstable.
2019-10-23Merge branch 'maint-0.4.0' into maint-0.4.1teor
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 remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-22Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.0' into maint-0.4.1teor
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.4.0' into maint-0.4.1Nick Mathewson
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-17Merge branch 'maint-0.4.0' into maint-0.4.1teor
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/1372' into maint-0.4.1teor
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.4.0' into maint-0.4.1Nick 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-01Fix a crash bug in max_u16_in_sl()Nick Mathewson
The documentation for this function says that the smartlist can contain NULLs, but the code only handled NULLs if they were at the start of the list. We didn't notice this for a long time, because when Tor is run normally, the sequence of msg_id_t is densely packed, and so this list (mapping msg_id_t to channel_id_t) contains no NULL elements. We could only run into this bug: * when Tor was running in embedded mode, and starting more than once. * when Tor ran first with more pubsub messages enabled, and then later with fewer. * When the second run (the one with fewer enabled pubsub messages) had at least some messages enabled, and those messages were not the ones with numerically highest msg_id_t values. Fixes bug 31898; bugfix on 47de9c7b0a828de7fb8129413db70bc4e4ecac6d in 0.4.1.1-alpha.
2019-10-01Add a test for max_u16_in_sl().Nick Mathewson
This test does not currently pass, because of bug 31898.
2019-10-01Rename max_in_sl to max_in_u16_sl, and expose it as STATIC.Nick Mathewson
Since we want to make this function slightly more visible for testing purposes, it needs a better name.
2019-10-01Merge branch 'bug31859_040' into bug31859_041teor
Merge TOR_TEST_RNG_SEED in maint-0.4.1 into the coverage line from bug31859_040.
2019-10-01Merge branch 'bug31859_035' into bug31859_040teor
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.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion