[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4

commit e042727cf02fbeb0dd193f5faa60f7caf1f19aea Merge: 3808e3015 614a78dda Author: Nick Mathewson nickm@torproject.org Date: Sat Jun 30 09:15:34 2018 -0400

Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4

Makefile.am | 5 +++-- changes/rust_cross | 2 ++ configure.ac | 25 ++++++++++++++++++++++--- src/rust/.cargo/config.in | 5 +++-- src/rust/tor_rust/include.am | 4 ++-- 5 files changed, 32 insertions(+), 9 deletions(-)