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

[nickm at torproject.org]

commit 152e4a1e5036e9456f98f7c647a3dc72d24b0f5e
Merge: b63d6984a ac1747e47
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 07:35:17 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/bug26415                |  3 +++
 src/rust/crypto/digests/sha2.rs | 24 ++++++++++++------------
 src/rust/crypto/lib.rs          | 14 +++++++-------
 3 files changed, 22 insertions(+), 19 deletions(-)