[tor-commits] [tor/master] Merge remote-tracking branch 'isis-github/bug26106'

[nickm at torproject.org]

commit 1442e818b67561c810c5d18894e29c57f8fdbbb0
Merge: e5974e515 4d349c6a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 09:16:04 2018 -0400

    Merge remote-tracking branch 'isis-github/bug26106'

 src/rust/Cargo.lock                          | 27 +++++++++------------------
 src/rust/Cargo.toml                          |  1 -
 src/rust/crypto/Cargo.toml                   | 15 +++++++++++----
 src/rust/{rand/lib.rs => crypto/rand/mod.rs} |  0
 src/rust/{ => crypto}/rand/rng.rs            |  4 ++--
 src/rust/include.am                          |  5 ++---
 src/rust/rand/Cargo.toml                     | 27 ---------------------------
 7 files changed, 24 insertions(+), 55 deletions(-)