aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-17Merge branch 'maint-0.3.4' into release-0.3.4release-0.3.4Nick Mathewson
2019-05-17Merge branch 'maint-0.2.9' into maint-0.3.4maint-0.3.4Nick Mathewson
2019-05-17Update geoip and geoip6 to the May 13 2019 database.Karsten Loesing
2019-04-19Merge branch 'maint-0.3.4' into release-0.3.4teor
2019-04-19Merge branch 'maint-0.2.9' into maint-0.3.4teor
"ours" merge, to avoid taking any changes from PR 792 in 0.3.4. (We already merged PR 791 for 29665 into 0.3.4.)
2019-04-19Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4teor
2019-04-19Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4teor
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' into rust-panic1-034teor
2019-04-06Merge branch 'maint-0.3.4' into release-0.3.4teor
2019-04-06Merge branch 'maint-0.2.9' into maint-0.3.4teor
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-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-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-03Merge branch 'maint-0.3.4' into release-0.3.4Nick 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 release-0.3.4teor
2019-04-02Merge branch 'maint-0.2.9' into maint-0.3.4teor
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 release-0.3.4teor
2019-03-27Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4teor
2019-03-26Merge branch 'maint-0.3.4' into release-0.3.4George Kadianakis
2019-03-26Merge branch 'tor-github/pr/820' into maint-0.3.4George Kadianakis
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-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 release-0.3.4teor
2019-03-20Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-03-20Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9teor
2019-03-18test/sr: update sr_state_free() to sr_state_free_all() in a commentteor
2019-03-18Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_mergeteor
2019-03-18test/sr: Clear SRVs after init, and before setupteor
Already merged to 0.4.0 and later in tor-github/pr/776. Backported to 0.2.9 and later with minor comment changes. Part of 29706.
2019-03-14relays shouldn't close idle rend circuitsRoger Dingledine
Allow connections to single onion services to remain idle without being disconnected. Relays acting as rendezvous points for single onion services were mistakenly closing idle established rendezvous circuits after 60 seconds, thinking that they are unused directory-fetching circuits that had served their purpose. Fixes bug 29665; bugfix on 0.2.1.26.
2019-03-14relays shouldn't close idle rend circuitsRoger Dingledine
Allow connections to single onion services to remain idle without being disconnected. Relays acting as rendezvous points for single onion services were mistakenly closing idle established rendezvous circuits after 60 seconds, thinking that they are unused directory-fetching circuits that had served their purpose. Fixes bug 29665; bugfix on 0.2.1.26.
2019-03-14Merge branch 'maint-0.3.4' into release-0.3.4teor
2019-03-14Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4teor
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion