Nick Mathewson 0db5c54957 Merge branch 'nss_squashed' into nss_merge %!s(int64=5) %!d(string=hai) anos
..
.cargo 614a78ddaa Fix Rust cross compilation. %!s(int64=6) %!d(string=hai) anos
crypto 6b609ce435 rust: run rustfmt %!s(int64=5) %!d(string=hai) anos
external 6b609ce435 rust: run rustfmt %!s(int64=5) %!d(string=hai) anos
protover e0b8c53f56 Merge branch 'maint-0.3.4' %!s(int64=5) %!d(string=hai) anos
smartlist 6b609ce435 rust: run rustfmt %!s(int64=5) %!d(string=hai) anos
tor_allocate 6b609ce435 rust: run rustfmt %!s(int64=5) %!d(string=hai) anos
tor_log 6b609ce435 rust: run rustfmt %!s(int64=5) %!d(string=hai) anos
tor_rust bf5704051c Merge remote-tracking branch 'teor/travis-osx-master' %!s(int64=5) %!d(string=hai) anos
tor_util 6b609ce435 rust: run rustfmt %!s(int64=5) %!d(string=hai) anos
.rustfmt.toml ceac10fc3d rust: max_width=100, other rustfmt settings. #27071 %!s(int64=5) %!d(string=hai) anos
Cargo.lock 4d349c6a61 rust: Update rand_core dependency to 0.2.0-pre.0. %!s(int64=6) %!d(string=hai) anos
Cargo.toml 508332feaf rust: Add "test-c-from-rust" feature-gate. %!s(int64=6) %!d(string=hai) anos
build.rs 0db5c54957 Merge branch 'nss_squashed' into nss_merge %!s(int64=5) %!d(string=hai) anos
include.am 01d0bf1803 add build.rs to EXTRA_DIST %!s(int64=6) %!d(string=hai) anos