Merge branch 'master' into develop

dalek-cryptography · Nov 26, 2019 · f4623b3 · f4623b3
2 parents 5616925 + 1ed350b
commit f4623b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.0.0
+
+* Update `rand_core` to `0.5`.  Because traits from `rand_core` are part of the
+  public API, this is technically a breaking change, but there are no other
+  changes to Merlin's API.
+
 ## 1.3.0
 
 * Replace `clear_on_drop` with `zeroize`, and implement `Zeroize` for `Transcript`.

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "merlin"
-version = "1.3.0"
+version = "2.0.0"
 authors = ["Henry de Valence <[email protected]>"]
 edition = "2018"
 readme = "README.md"