commit 72a5ae8c667fac09a639c46a145c9612424ef301 Merge: 683776bfa 73bc86382 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 08:38:21 2018 -0400

Merge branch 'maint-0.3.4'

.gitignore | 2 + config.rust.in | 22 +++++ configure.ac | 29 ++++++ link_rust.sh.in | 10 +++ src/common/util.c | 1 + src/or/control.c | 1 + src/or/geoip.c | 1 + src/rust/build.rs | 179 +++++++++++++++++++++++++++++++++++++ src/rust/crypto/Cargo.toml | 2 +- src/rust/crypto/digests/sha2.rs | 23 +++-- src/rust/crypto/lib.rs | 3 +- src/rust/external/crypto_digest.rs | 10 ++- src/rust/include.am | 1 + src/test/include.am | 6 +- src/test/rust_supp.txt | 1 + src/test/test_rust.sh | 3 +- 16 files changed, 280 insertions(+), 14 deletions(-)