commit edf3d6b7ee2c02804b1c590949af6e24d1d37383 Merge: 05662f35e 1c50331b9 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 09:59:10 2017 -0500

Merge remote-tracking branch 'chelseakomlo/24032-cargo-rust-sync'

doc/HACKING/GettingStartedRust.md | 8 ++++++++ src/rust/protover/ffi.rs | 3 ++- src/rust/protover/protover.rs | 12 ++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-)