[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit 028523c801606301fe744eee462a55efeda385ec
Merge: 57155d38a e042727cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 30 09:15:39 2018 -0400

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