From b8d9b390ca66f364994dadd09d842eae7cf475f1 Mon Sep 17 00:00:00 2001
From: Henry de Valence <hdevalence@hdevalence.ca>
Date: Mon, 6 May 2019 19:49:44 -0700
Subject: [PATCH] Bump version to 1.0.2

---
 CHANGELOG.md | 10 ++++++++++
 Cargo.toml   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbcbebf0..4a5a886d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 Entries are listed in reverse chronological order.
 
+## 1.0.2
+
+* Updates the library to use the renamed functions in Merlin 1.1.
+* Adds additional validation checks to prevent identity points being used as
+  part of a proof.  This does not appear to have security content, but is
+  intended as a defense-in-depth mechanism.  
+  See [this comment][identity_comment] for more motivation.
+* Documentation tweaks.
+
 ## 1.0.1
 
 * Tweaks to crate metadata.
@@ -20,3 +29,4 @@ Entries are listed in reverse chronological order.
 Initial prerelease version, supporting single and aggregated range proofs, and
 multiparty proof aggregation.
 
+[identity_comment]: https://github.com/dalek-cryptography/bulletproofs/pull/248#discussion_r251916724
diff --git a/Cargo.toml b/Cargo.toml
index 0b264336..7a52f370 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bulletproofs"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Cathie Yun <cathieyun@gmail.com>", 
            "Henry de Valence <hdevalence@hdevalence.ca>",
            "Oleg Andreev <oleganza@gmail.com>"]