commit c8aecd14fecc55f5d8a48f793c24e3df68f1483c Merge: 7e50d43f0 6b609ce43 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 16 08:43:05 2018 -0400

Merge branch 'pr275_squashed'

Makefile.am | 31 ++++++++ doc/HACKING/CodingStandardsRust.md | 2 +- src/rust/.rustfmt.toml | 14 +++- src/rust/build.rs | 35 ++++----- src/rust/crypto/digests/sha2.rs | 36 +++++---- src/rust/crypto/lib.rs | 5 +- src/rust/crypto/rand/rng.rs | 29 +++++--- src/rust/external/crypto_digest.rs | 118 +++++++++++++++++++++--------- src/rust/external/crypto_rand.rs | 7 +- src/rust/external/external.rs | 9 +-- src/rust/protover/errors.rs | 38 ++++++---- src/rust/protover/ffi.rs | 19 ++--- src/rust/protover/lib.rs | 7 +- src/rust/protover/protoset.rs | 62 ++++++++++------ src/rust/protover/protover.rs | 134 +++++++++++++++++++++------------- src/rust/protover/tests/protover.rs | 24 ++++-- src/rust/smartlist/smartlist.rs | 10 +-- src/rust/tor_allocate/tor_allocate.rs | 14 ++-- src/rust/tor_log/tor_log.rs | 35 ++++----- src/rust/tor_rust/lib.rs | 4 +- src/rust/tor_util/ffi.rs | 4 +- src/rust/tor_util/strings.rs | 4 +- 22 files changed, 394 insertions(+), 247 deletions(-)