commit 95b78d4178a07b9b33782a2d3193aa176a88ca80 Merge: b06997914 00a473733 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 21 17:04:38 2018 -0400

Merge branch 'bug25310_r1_033' into maint-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(-)