[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

[nickm at torproject.org]

commit 3223e303f4d87ad6fa9ece31b55a9bd87afa779d
Merge: d25b4230f e042727cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 30 09:15:39 2018 -0400

    Merge branch 'maint-0.3.4' into release-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(-)