Merge pull request #158 from rust-bitcoin/2020-10-13

increase version to 3.0.0

Author: sanket1729

CHANGELOG.md

@@ -1,14 +1,6 @@
-# 1.0.0 - July 6, 2020
+# 3.0.0 - Oct 13, 2020
 
-- Added the following aliases to miniscript for ease of operations 
-	- Rename `pk` to `pk_k`
-	- Rename `thresh_m` to `multi`
-	- Add alias `pk(K)` = `c:pk_k(K)`
-	- Add alias `pkh(K)` = `c:pk_h(K)`
-- Fixed Miniscript parser bugs when decoding Hashlocks
-- Added scriptContext(`Legacy` and `Segwitv0`) to Miniscript. 
-- Miscellaneous fixes against DoS attacks for heavy nesting.
-- Fixed Satisfier bug that caused flipping of arguments for `and_v` and `and_n` and `and_or`
+- **Bump MSRV to 1.29**
 
 # 2.0.0 - Oct 1, 2020
 
@@ -22,3 +14,16 @@
 - Added a generic psbt finalizer and extractor
 - Updated Satisfaction API for checking time/height before setting satisfaction
 - Added a policy entailment API for more miniscript semantic analysis
+
+# 1.0.0 - July 6, 2020
+
+- Added the following aliases to miniscript for ease of operations 
+	- Rename `pk` to `pk_k`
+	- Rename `thresh_m` to `multi`
+	- Add alias `pk(K)` = `c:pk_k(K)`
+	- Add alias `pkh(K)` = `c:pk_h(K)`
+- Fixed Miniscript parser bugs when decoding Hashlocks
+- Added scriptContext(`Legacy` and `Segwitv0`) to Miniscript. 
+- Miscellaneous fixes against DoS attacks for heavy nesting.
+- Fixed Satisfier bug that caused flipping of arguments for `and_v` and `and_n` and `and_or`
+

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "miniscript"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Andrew Poelstra <[email protected]>, Sanket Kanjalkar <[email protected]>"]
 repository = "https://github.com/apoelstra/miniscript"
 description = "Miniscript: a subset of Bitcoin Script designed for analysis"