Commit History

Author SHA1 Message Date
  Nick Mathewson e2dde342b2 Merge branch 'maint-0.3.4' into release-0.3.4 5 years ago
  Nick Mathewson a521c42788 Merge branch 'maint-0.2.9' into maint-0.3.4 5 years ago
  Karsten Loesing 4e262196a8 Update geoip and geoip6 to the May 13 2019 database. 5 years ago
  teor fa6296df3a Merge branch 'maint-0.3.4' into release-0.3.4 5 years ago
  teor cbce8dedd3 Merge branch 'maint-0.2.9' into maint-0.3.4 5 years ago
  teor 116970dda7 Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4 5 years ago
  teor b1762f8d12 Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4 5 years ago
  teor 8154b33f9c Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4 5 years ago
  teor 2460b4461f Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9 5 years ago
  teor 4d504bf098 Merge branch 'maint-0.2.9' into maint-0.3.4 5 years ago
  teor ec213ae8a0 Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9 5 years ago
  teor 5ab5c8ec15 Merge branch 'rust-panic1' into rust-panic1-034 5 years ago
  teor 2afba291bb Merge branch 'maint-0.3.4' into release-0.3.4 5 years ago
  teor 48e990359b Merge branch 'maint-0.2.9' into maint-0.3.4 5 years ago
  teor 102178e6d4 Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4 5 years ago
  teor a0db5ade3e Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9 5 years ago
  teor e1955a2c54 Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9 5 years ago
  teor a514e02476 Merge branch 'bug29036-029' into bug29036-29962-034 5 years ago
  teor f0cd8f804f Makefile: actually, don't delete the gcno files 5 years ago
  Nick Mathewson 1710f4bbd6 Do not cache bogus results from classifying client ciphers 5 years ago
  Nick Mathewson b0428b6dc7 Merge branch 'maint-0.3.4' into release-0.3.4 5 years ago
  Nick Mathewson 3cfcfbac46 Merge branch 'maint-0.2.9' into maint-0.3.4 5 years ago
  Karsten Loesing 54e249e269 Update geoip and geoip6 to the April 2 2019 database. 5 years ago
  teor 6c273d86ed Merge branch 'maint-0.3.4' into release-0.3.4 5 years ago
  teor 74775b2dfd Merge branch 'maint-0.2.9' into maint-0.3.4 5 years ago
  teor 33be8d8295 Travis: merge before_cache from 29036 and 29962 5 years ago
  rl1987 124990aa01 Add changes file 5 years ago
  rl1987 0c6cfd9c65 Cleanup cargo registry before each Rust-enabled build 5 years ago
  teor ac28e56ccb Merge branch 'bug29036-029' into bug29036-29962-034 5 years ago
  teor 57e9fe2bba Makefile: delete all the gcov-related files in reset-gcov 5 years ago
  teor eb0bd18d6e changes: Use the first Tor version with CI coverage for the 29036 changes file 5 years ago
  teor 5600373e88 Merge branch 'maint-0.3.4' into release-0.3.4 5 years ago
  teor 6d057c56f1 Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4 5 years ago
  George Kadianakis f8304cc6fb Merge branch 'maint-0.3.4' into release-0.3.4 5 years ago
  George Kadianakis ee43bc706c Merge branch 'tor-github/pr/820' into maint-0.3.4 5 years ago
  teor f7688cb179 test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9 5 years ago
  juga0 4ab2e9a599 bwauth: Ignore bandwidth file lines with "vote=0" 5 years ago
  Alexander Færøy fbb1c7adfc Handle errors from coveralls more gracefully. 5 years ago
  Alexander Færøy 0267c453e2 Run `make reset-gcov` after the script target in Travis CI is done. 5 years ago
  teor 1e154d7a15 Merge branch 'maint-0.3.4' into release-0.3.4 5 years ago
  teor d7a5fdcb74 Merge branch 'maint-0.2.9' into maint-0.3.4 5 years ago
  teor db2ac3b9fe Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9 5 years ago
  teor aec6ee201b test/sr: update sr_state_free() to sr_state_free_all() in a comment 5 years ago
  teor 1d0146e2a2 Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge 5 years ago
  teor c44ad396f8 test/sr: Clear SRVs after init, and before setup 5 years ago
  Roger Dingledine a3bc950e42 relays shouldn't close idle rend circuits 5 years ago
  Roger Dingledine add0f89c14 relays shouldn't close idle rend circuits 5 years ago
  teor 547ee1c345 Merge branch 'maint-0.3.4' into release-0.3.4 5 years ago
  teor e021f89f36 Merge branch 'maint-0.2.9' into maint-0.3.4 5 years ago
  teor f3b17a6b26 Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4 5 years ago