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

commit ac1747e47fc8a8486df3844045238f72bd4985fe Merge: e309aa4c8 bfd36177c Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 20 07:35:13 2018 -0400

Merge remote-tracking branch 'catalyst-github/bug26415_034' into 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(-)