From 8b07fe12e6bc829b1ffe7f98eef6093e58352506 Mon Sep 17 00:00:00 2001
From: Mathias Svensson <idolf@pwnies.dk>
Date: Tue, 6 Sep 2016 11:33:46 -1000
Subject: [PATCH] Release 3.0.2

---
 CHANGELOG.md      | 6 ++++++
 pwnlib/version.py | 2 +-
 setup.py          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4aed77e85..9168eebdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
 This changelog only includes added major features and changes. Bugfixes and
 minor changes are omitted.
 
+## 3.0.2 (September 6 2016)
+
+- Cherry-pick #695, as this was a regression-fix.
+- Added a fix for the update checker, as it would suggest prereleases as updates to stable releases.
+- Various documentation fixes.
+
 ## 3.0.1 (August 20 2016)
 
 A small bugfix release. There were a lot of references to the `master`-branch, however after 3.0.0 we use the names `stable`, `beta` and `dev` for our branches.
diff --git a/pwnlib/version.py b/pwnlib/version.py
index b7a553143..da4039bce 100644
--- a/pwnlib/version.py
+++ b/pwnlib/version.py
@@ -1 +1 @@
-__version__ = '3.0.1'
+__version__ = '3.0.2'
diff --git a/setup.py b/setup.py
index b290d5e96..5b93a9317 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@
 setup(
     name                 = 'pwntools',
     packages             = find_packages(),
-    version              = '3.0.1',
+    version              = '3.0.2',
     data_files           = [('',
                              ['LICENSE-pwntools.txt',
                              ]),