Merge branch 'develop' into remove-rustc-pin

Author: hdevalence

Cargo.toml

@@ -12,16 +12,16 @@ keywords = ["cryptography", "ristretto", "zero-knowledge", "bulletproofs"]
 description = "A pure-Rust implementation of Bulletproofs using Ristretto"
 
 [dependencies]
-curve25519-dalek = { version = "1.0.0-pre.0", features = ["serde"] }
+curve25519-dalek = { version = "1.0.0-pre.1", features = ["serde"] }
 subtle = "2.0.0-pre.0"
 sha3 = "0.8"
 digest = "0.8"
-rand = "0.5"
+rand = "0.6"
 byteorder = "1"
 serde = "1"
 serde_derive = "1"
 failure = "0.1"
-merlin = "1.0.0-pre.0"
+merlin = "1.0.0-pre.1"
 clear_on_drop = "0.2"
 
 [dev-dependencies]