summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Bug 27066: Remove old 0.2.1.x compatibility code.bug27066-cbtresetMike Perry2018-08-22
* Bug 27066: Reset CBT data upon error.Mike Perry2018-08-22
* Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-08-22
|\
| * Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson2018-08-22
| |\
| | * Mark cert_matches_key as not-intrusive; fix stretch compilation.Nick Mathewson2018-08-22
* | | Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-08-21
|\ \ \ | |/ /
| * | Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson2018-08-21
| |\ \ | | |/
| | * Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9Nick Mathewson2018-08-21
| | |\
| * | \ Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2Nick Mathewson2018-08-21
| |\ \ \
* | \ \ \ Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3Nick Mathewson2018-08-21
|\ \ \ \ \
| * \ \ \ \ Merge branch 'travis-osx-032' into travis-osx-033teor2018-08-10
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'travis-osx-029' into travis-osx-032teor2018-08-10
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Travis: add a missing macOS asciidoc env varteor2018-08-10
| * | | | | Merge branch 'travis-osx-032' into travis-osx-033teor2018-08-10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'travis-osx-029' into travis-osx-032teor2018-08-10
| | |\ \ \ \ | | | |/ / /
| | | * | | Travis: add a missing macOS asciidoc dependencyteor2018-08-10
| | | * | | Travis: put distcheck first for readabilityteor2018-08-10
| | | * | | Changes file for Travis: enable macOS buildsteor2018-08-10
| | | * | | Travis: fix a typoteor2018-08-10
| | * | | | Travis: Improve Rust commentsteor2018-08-10
| * | | | | Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4teor2018-08-10
| * | | | | Travis: Check Rust with distcheck in 0.3.3 and laterteor2018-08-10
| * | | | | Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and laterteor2018-08-10
| * | | | | Rust: use a consistent working directory in builds and teststeor2018-08-10
| * | | | | Stop setting $CARGO_HOME in src/rust/tor_rust/include.amteor2018-08-10
| * | | | | Merge branch 'travis-osx-032' into travis-osx-033teor2018-08-10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Changes file for Rust: backport src/test/test_rust.sh from masterteor2018-08-10
| | * | | | Travis: Use cargo cacheteor2018-08-10
| | * | | | Fix $abs_top_srcdir in test_rust.shteor2018-08-10
| | * | | | Stop setting $CARGO_HOMEteor2018-08-10
| | * | | | Rust: backport src/test/test_rust.sh from masterteor2018-08-10
| | * | | | Travis: fix a typoteor2018-08-09
| | * | | | Travis: add rust cargo offline modeteor2018-08-09
| | * | | | Travis: add rust cargo online modeteor2018-08-09
| | * | | | Travis: add lzma and zstd, where availableteor2018-08-09
| | * | | | Merge branch 'travis-osx-029' into travis-osx-032teor2018-08-09
| | |\ \ \ \ | | | |/ / /
| | | * | | Travis: list installed package versions before buildingteor2018-08-09
| | | * | | Travis: run an asciidoc buildteor2018-08-09
| | | * | | Travis: Use ccacheteor2018-08-09
| | | * | | Travis: make macOS builds work for Tor 0.2.9teor2018-08-09
| | | * | | Travis: create configure flags once, then echo the flagsteor2018-08-09
| | | * | | Travis: enable macOS buildsteor2018-08-09
| | | * | | Travis: Rewrite .travis.ymlteor2018-08-09
| | | * | | Add more optional packages to TravisTaylor Yu2018-08-09
* | | | | | Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-08-21
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson2018-08-21
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Rewrite test_tortls_cert_matches_key()Nick Mathewson2018-08-20
| | * | | | Use our x509 wrapper code in tor_tls_cert_matches_key()Nick Mathewson2018-08-20
* | | | | | Add changes file for 26873. I missed this when merging earlier.Nick Mathewson2018-08-21
* | | | | | Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3Nick Mathewson2018-08-17
|\ \ \ \ \ \