From 7fb4a2bc636c7ef42ac408115b283fc8512c6bc6 Mon Sep 17 00:00:00 2001
From: jtpereyda <jtpereyda@users.noreply.github.com>
Date: Sat, 25 May 2019 22:06:12 -0700
Subject: [PATCH 1/2] v0.1.5 changes

---
 CHANGELOG.rst       | 7 +++++--
 boofuzz/__init__.py | 2 +-
 docs/conf.py        | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fdcdf673..b755fa7d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,13 +1,16 @@
 Upcoming
 ========
+
+v0.1.5
+======
 Features
 --------
 - New curses logger class to provide a console gui similar to the webinterface. Use the session option `console_gui` to enable it.
   This has not been tested under Windows!
-- New Session option `keep_web_open` to allow analyzing the test results after test completion.
-- Added compatibility for python3
+- Compatibility for Python 3
 - Large test cases are now truncated, unless a failure is detected.
 - When a target fails to respond after restart, boofuzz will now continue to restart instead of crashing.
+- New Session option `keep_web_open` to allow analyzing the test results after test completion.
 - Process monitor creates new crash file for each run by default.
 - Long lines now wrap in web view; longer lines no longer need to be truncated.
 - Process monitor now stores crash bins in JSON format instead of pickled format.
diff --git a/boofuzz/__init__.py b/boofuzz/__init__.py
index 5d2e67a7..9827b1a1 100644
--- a/boofuzz/__init__.py
+++ b/boofuzz/__init__.py
@@ -32,7 +32,7 @@
 from .socket_connection import SocketConnection
 from past.builtins import map
 from builtins import chr
-__version__ = '0.1.4'
+__version__ = '0.1.5'
 
 
 # REQUEST MANAGEMENT
diff --git a/docs/conf.py b/docs/conf.py
index 0fff06d9..e1fd3c4f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.1.4'
+version = u'0.1.5'
 # The full version, including alpha/beta/rc tags.
-release = u'0.1.4'
+release = u'0.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From ff5fa3e19e087211fd6978ccc5ce239867155d5e Mon Sep 17 00:00:00 2001
From: jtpereyda <jtpereyda@users.noreply.github.com>
Date: Sat, 25 May 2019 22:34:27 -0700
Subject: [PATCH 2/2] guard curses import to allow boofuzz to run on Windows

---
 boofuzz/fuzz_logger_curses.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/boofuzz/fuzz_logger_curses.py b/boofuzz/fuzz_logger_curses.py
index a36b8014..f4cfdf5f 100644
--- a/boofuzz/fuzz_logger_curses.py
+++ b/boofuzz/fuzz_logger_curses.py
@@ -1,7 +1,10 @@
 from __future__ import division
 import sys
 import time
-import curses
+try:
+    import curses
+except ImportError:
+    pass  # Allow package to be imported on Windows -- will fail if you try to use it
 import signal
 import threading