aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-19Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9teor
2019-04-19Merge branch 'maint-0.2.9' into maint-0.3.4teor
"ours" merge, to avoid taking any changes from PR 772 in 0.3.4. (We already merged a different fix for 23790 into 0.3.2 and later.)
2019-04-19Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9teor
2019-04-15Merge branch 'rust-panic1-034' into rust-panic1-035teor
Trivial merge: a blank line was removed between 0.3.4 and 0.3.5.
2019-04-15Merge branch 'rust-panic1' into rust-panic1-034teor
2019-04-12changes: file for 30117teor
2019-04-12Travis: expand "make test-stem", so timelimit can signal python on timeoutteor
Unlike kill, timelimit can only signal the process it launches. So we need timelimit to launch python, not make. Closes ticket 30117; diagnostic for 29437.
2019-04-11Travis: use stem backtrace signals with timelimitteor
Part of 30117.
2019-04-10test: Also avoid reading the system default torrc in integration teststeor
Part of 29702.
2019-04-10Add changes filerl1987
2019-04-10Use empty torrc file when launching tor in test_rebind.pyrl1987
2019-04-09Actually I believe this should be an EINVAL.Nick Mathewson
2019-04-08Detect and suppress an additional gmtime() warning in test_util.cNick Mathewson
Fixes bug 29922; bugfix on 0.2.9.3-alpha when we tried to capture all these warnings. No need to backport any farther than 0.3.5, though -- these warnings don't cause test failures before then. This one was tricky to find because apparently it only happened on _some_ windows builds.
2019-04-06Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-04-06Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9teor
2019-04-05Merge branch 'bug29036-29962-034' into bug29036-29962-035teor
2019-04-05Merge branch 'bug29036-029' into bug29036-29962-034teor
2019-04-05Makefile: actually, don't delete the gcno filesteor
We need to keep the gcno files, because they are created at compile time.
2019-04-04Merge branch 'bug30021_029' into bug30021_035Nick Mathewson
2019-04-04Do not cache bogus results from classifying client ciphersNick Mathewson
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-04Travis: Terminate test-stem if it takes more than 9.5 minutes to runteor
(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-03Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-04-03Merge branch 'maint-0.2.9' into maint-0.3.4Nick Mathewson
2019-04-03Update geoip and geoip6 to the April 2 2019 database.Karsten Loesing
2019-04-02Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-04-02Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-04-01Merge branch 'bug29036-29962-034' into bug29036-29962-035teor
Merge the moved coverage line from 29036 with the stem changes in maint-0.3.5.
2019-04-01Travis: merge before_cache from 29036 and 29962teor
And add some useful comments
2019-04-01Add changes filerl1987
2019-04-01Cleanup cargo registry before each Rust-enabled buildrl1987
Also, refrain from caching target/. See: https://levans.fr/rust_travis_cache.html
2019-04-01Merge branch 'bug29036-029' into bug29036-29962-034teor
2019-04-01Makefile: delete all the gcov-related files in reset-gcovteor
And fix a comment. See: https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
2019-04-01changes: Use the first Tor version with CI coverage for the 29036 changes fileteor
Otherwise, "make check-changes" will complain when we backport the change.
2019-03-27Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-03-27Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4teor
2019-03-22test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9teor
We need a recent test-network.sh to use new chutney features in CI. Fixes bug 29703; bugfix on 0.2.9.1-alpha.
2019-03-21test/dir: add an extra argument to dirserv_read_measured_bandwidths()teor
Part of 29806.
2019-03-21Merge branch 'ticket29806_034_squashed' into ticket29806_035_squashed_mergedteor
Copy and paste the vote=0 code from the old src/or/dirserv.c to the new src/feature/dirauth/bwauth.c.
2019-03-21bwauth: Ignore bandwidth file lines with "vote=0"juga0
so that the relays that would be "excluded" from the bandwidth file because of something failed can be included to diagnose what failed, without still including these relays in the bandwidth authorities vote. Closes #29806.
2019-03-20Handle errors from coveralls more gracefully.Alexander Færøy
Since we have moved coveralls to the script target the entire build will now fail if coveralls fail. We handle it more gracefully by echo'ing the failure instead of doing a hard-failure. See: https://bugs.torproject.org/29036
2019-03-20Run `make reset-gcov` after the script target in Travis CI is done.Alexander Færøy
This should ensure that GCDA files are never entering the cache of Travis CI. See: https://bugs.torproject.org/29036
2019-03-20Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-03-20Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-03-20Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5teor
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion