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

[nickm at torproject.org]

commit 334edc22d1bd05cbadb1ccc132d099e8a282bff4
Merge: 5acbcf150 4971d7afa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 07:55:15 2018 -0400

    Merge branch 'maint-0.3.4'

 src/rust/crypto/Cargo.toml   | 1 -
 src/rust/protover/Cargo.toml | 1 -
 src/rust/tor_log/Cargo.toml  | 1 -
 src/rust/tor_log/tor_log.rs  | 4 ++--
 4 files changed, 2 insertions(+), 5 deletions(-)