aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)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
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
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
2019-04-04Do not cache bogus results from classifying client ciphersNick Mathewson
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
2019-04-01Add changes filerl1987
2019-04-01Cleanup cargo registry before each Rust-enabled buildrl1987
2019-04-01Merge branch 'bug29036-029' into bug29036-29962-034teor
2019-04-01Makefile: delete all the gcov-related files in reset-gcovteor
2019-04-01changes: Use the first Tor version with CI coverage for the 29036 changes fileteor
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
2019-03-21bwauth: Ignore bandwidth file lines with "vote=0"juga0
2019-03-20Handle errors from coveralls more gracefully.Alexander Færøy
2019-03-20Run `make reset-gcov` after the script target in Travis CI is done.Alexander Færøy
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
2019-03-14relays shouldn't close idle rend circuitsRoger Dingledine
2019-03-14relays shouldn't close idle rend circuitsRoger Dingledine
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