From 483709763a84cde9dc716fcd9bb22eed3a1b5730 Mon Sep 17 00:00:00 2001
From: Eric Hennenfent <eric.hennenfent@trailofbits.com>
Date: Thu, 30 Jan 2020 23:13:12 -0800
Subject: [PATCH] Manticore 0.3.3 (#1598)

* Bump version number

* Add long description

* Update CHANGELOG.md

* Update unreleased changes URL

* Update changelog
---
 CHANGELOG.md | 29 ++++++++++++++++++++++++++++-
 docs/conf.py |  4 ++--
 setup.py     |  6 +++++-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d06e9c9b..c8109bb8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,33 @@
 # Change Log
 
-## [Unreleased](https://github.com/trailofbits/manticore/compare/0.3.2...HEAD)
+## [Unreleased](https://github.com/trailofbits/manticore/compare/0.3.3...HEAD)
+
+## 0.3.3 - 2020-01
+
+Thanks to our external contributors!
+
+ - [catenacyber](https://github.com/trailofbits/manticore/commits?author=catenacyber)
+
+### Ethereum
+* **[added API]** Flag to only generate alive states when finalizing Manticore [#1554](https://github.com/trailofbits/manticore/pull/1554)
+* Fix gas check [#1587](https://github.com/trailofbits/manticore/pull/1587)
+
+### Native
+* **[added API]** Add post-instruction hooks [#1579](https://github.com/trailofbits/manticore/pull/1579)
+* Fix issue with re-using stdio file descriptors after they'd been closed [#1604](https://github.com/trailofbits/manticore/pull/1604)
+
+### WASM
+* **[added API]** getattr-style calls for WASM functions [#1578](https://github.com/trailofbits/manticore/pull/1578)
+* **[changed API]** Pass state to function calls instead of constraint sets [#1578](https://github.com/trailofbits/manticore/pull/1578)
+* **[added API]** Added read/write helper methods to memory instances [#1589](https://github.com/trailofbits/manticore/pull/1589)
+
+### Other
+* **[added API]** Added streamlined state serialization interface [#1596](https://github.com/trailofbits/manticore/pull/1596)
+* Fixed Z3 version parsing [#1551](https://github.com/trailofbits/manticore/pull/1551)
+* Unique names for ArrayVars [#1552](https://github.com/trailofbits/manticore/pull/1552)
+* Improve pickling and multiprocessing compatibility [#1583](https://github.com/trailofbits/manticore/pull/1583)
+* Fix SMTLib visitor bug that broke the example tests [#1577](https://github.com/trailofbits/manticore/pull/1577)
+* Optimize MinMax SMTLib operations [#1599](https://github.com/trailofbits/manticore/pull/1599)
 
 ## 0.3.2 - 2019-11-11
 
diff --git a/docs/conf.py b/docs/conf.py
index a58464224..e537d40cd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "0.3.2"
+version = "0.3.3"
 # The full version, including alpha/beta/rc tags.
-release = "0.3.2"
+release = "0.3.3"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index fcf6655da..55df85f81 100644
--- a/setup.py
+++ b/setup.py
@@ -34,13 +34,17 @@ def rtd_dependent_deps():
     "lint": lint_deps,
 }
 
+this_directory = os.path.abspath(os.path.dirname(__file__))
+with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
+    long_description = f.read()
 
 setup(
     name="manticore",
     description="Manticore is a symbolic execution tool for analysis of binaries and smart contracts.",
+    long_description=long_description,
     url="https://github.com/trailofbits/manticore",
     author="Trail of Bits",
-    version="0.3.2.1",
+    version="0.3.3",
     packages=find_packages(exclude=["tests", "tests.*"]),
     python_requires=">=3.6",
     install_requires=[