From d3d1e9c924a69e3e312d74365a2a9e2a418c5bac Mon Sep 17 00:00:00 2001
From: Mark Mossberg <mark.mossberg@gmail.com>
Date: Fri, 18 Aug 2017 13:48:33 -0400
Subject: [PATCH] Manticore 0.1.4 (#462)

* Bump version number

* Changelog updates

* Include changes to undocumented functionality, but mark as experimental

* Function notation

* Update CHANGELOG.md

* thanks!!!
---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++----
 setup.py     |  2 +-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c7325d..b2bd35a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,34 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## [Unreleased](https://github.com/trailofbits/manticore/compare/0.1.3...HEAD)
+## [Unreleased](https://github.com/trailofbits/manticore/compare/0.1.4...HEAD)
+
+## 0.1.4 - 2017-08-18
+
+### Added
+
+- `Manticore.locked_context()` (safe parallel context access)
+- `State.generate_testcase()` (arbitrary testcase generation from hooks)
+- Documentation on [gotchas](http://manticore.readthedocs.io/en/latest/gotchas.html)
+- Command line interface support for symbolic files (`--file`) (thanks [251](https://github.com/251)!)
+- [Experimental] `State.context['branches']` (States track symbolic branches)
+- [Experimental] Support for emulation of [Binary Ninja](https://binary.ninja) IL
+
+### Changed
+
+- Taint parameters added to `State.new_symbolic_buffer()` and `State.symbolicate_buffer()` (thanks [ehennenfent](https://github.com/ehennenfent)!)
+- Improved support for ARM binaries
+- `Manticore.verbosity` logging preset levels
+
+### Fixed
+
+- Numerous bugfixes
+- Fixed workspace error message bug (thanks [chowdaryd](https://github.com/chowdaryd)!)
+- Fixed double workspace bug
+
+### Removed
+
+- [Experimental] `State.generate_inputs()` (superseded by `State.generate_testcase()`)
 
 ## 0.1.3 - 2017-07-14
 
@@ -27,15 +54,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Added
 
-- Function modeling API (`state.invoke_model`, `manticore.variadic`)
+- Function modeling API (`state.invoke_model()`, `manticore.variadic`)
 - `strcmp` and `strlen` models
-- `state.solve_buffer`
+- `state.solve_buffer()`
 - Additional `state` APIs
+- Support for ARMv7 Thumb mode
 
 ### Changed
 
 - Parallel processing API (`m.run(procs)`)
-- `state.solve_n`
+- `state.solve_n()`
 
 ### Fixed
 
diff --git a/setup.py b/setup.py
index 68b0715..cfea1c4 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ setup(
     description='Manticore is a prototyping tool for dynamic binary analysis, with support for symbolic execution, taint analysis, and binary instrumentation.',
     url='https://github.com/trailofbits/manticore',
     author='Trail of Bits',
-    version='0.1.3',
+    version='0.1.4',
     packages=find_packages(),
     install_requires=[
         'capstone>=3.0.5rc2',