commit 76d14aabd405003c815abcc3513172060c629fc5 Merge: 5b32475fb 95b78d417 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 21 17:04:41 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
doc/HACKING/CodingStandardsRust.md | 36 ++++++++++++++++++++++++++ scripts/maint/updateRustDependencies.sh | 45 +++++++++++++++++++++++++++++++++ src/ext/rust | 2 +- src/rust/Cargo.lock | 28 ++++++++++---------- src/rust/external/Cargo.toml | 2 +- src/rust/protover/Cargo.toml | 2 +- src/rust/smartlist/Cargo.toml | 2 +- src/rust/tor_allocate/Cargo.toml | 2 +- src/rust/tor_util/Cargo.toml | 2 +- 9 files changed, 101 insertions(+), 20 deletions(-)