commit bcc1368c77d6ed8ac7f8bd81acdec7bb2da9f925 Merge: ac64e0079 9799cc90b Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 18 13:10:47 2018 -0400

Merge branch 'maint-0.3.4'

src/rust/crypto/lib.rs | 8 ++++++++ src/rust/crypto/rand/mod.rs | 10 ---------- src/rust/crypto/rand/rng.rs | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-)