Merge branch 'release/1.0.1'

Author: hdevalence

CHANGELOG.md

@@ -1,15 +1,25 @@
-# 0.3
+# Changelog
+
+## 1.0.1
+
+* Update the `curve25519-dalek` dev-dependency used for tests to version `1.0`.
+
+## 1.0.0
+
+* Initial stable version.
+
+## 0.3
 
 * Forces labels to be `&'static`
 * Merlin-specific domain separator
 * Use a pointer cast instead of a transmute
 * Clarify example documentation
 
-# 0.2
+## 0.2
 
 * Adds a TranscriptRng for use by the prover.
 
-# 0.1
+## 0.1
 
 * Initial prototype version.
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "merlin"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Henry de Valence <hdevalence@hdevalence.ca>",
            "isis agora lovecruft <isis@patternsinthevoid.net>"]
 readme = "README.md"
@@ -26,7 +26,7 @@ rand = "0.6"
 
 [dev-dependencies]
 strobe-rs = "0.3"
-curve25519-dalek = "1.0.0-pre.1"
+curve25519-dalek = "1"
 rand_chacha = "0.1"
 
 [features]