Merge branch 'beta' into dev

CHANGELOG.md

@@ -9,15 +9,20 @@ The table below shows which release corresponds to each branch, and what date th
 
 | Version          | Branch   | Release Date           |
 | ---------------- | -------- | ---------------------- |
-| [3.2.0](#320)    | `dev`    | Nov 12, 2016 (planned)
-| [3.1.0](#310)    | `beta`   | Oct 1, 2016 (planned) 
-| [3.0.4](#304)    | `stable` | Sept 19, 2016
+| [3.3.0](#330)    | `dev`    | Dec 24, 2016 (planned)
+| [3.2.0](#320)    | `beta`   | Nov 12, 2016 (planned)
+| [3.1.0](#310)    | `stable` | Oct 2, 2016
+| [3.0.4](#304)    |          | Sept 19, 2016
 | [3.0.3](#303)    |          | Sept 18, 2016
 | [3.0.2](#302)    |          | Sept 6, 2016
 | [3.0.1](#301)    |          | Aug 20, 2016
 | [3.0.0](#300)    |          | Aug 20, 2016
 | [2.2.0](#220)    |          | Jan 5, 2015
 
+## 3.3.0
+
+Nothing yet.
+
 ## 3.2.0
 
 - [#695][695] Fixed a performance regression in `phd`.

README.md

@@ -2,7 +2,7 @@
 ![pwntools logo](https://github.com/Gallopsled/pwntools/blob/stable/docs/source/logo.png?raw=true)
 
 [![Docs](https://readthedocs.org/projects/pwntools/badge/?version=stable)](https://docs.pwntools.com/)
-[![PyPI](https://img.shields.io/badge/pypi-v3.0.4-green.svg?style=flat)](https://pypi.python.org/pypi/pwntools/)
+[![PyPI](https://img.shields.io/badge/pypi-v3.1.0-green.svg?style=flat)](https://pypi.python.org/pypi/pwntools/)
 [![Travis](https://travis-ci.org/Gallopsled/pwntools.svg)](https://travis-ci.org/Gallopsled/pwntools)
 [![Coveralls](https://img.shields.io/coveralls/Gallopsled/pwntools/dev.svg)](https://coveralls.io/github/Gallopsled/pwntools?branch=dev)
 [![Twitter](https://img.shields.io/badge/twitter-pwntools-4099FF.svg?style=flat)](https://twitter.com/pwntools)

pwnlib/version.py

@@ -1 +1 @@
-__version__ = '3.2.0dev'
+__version__ = '3.3.0dev'

setup.py

@@ -83,7 +83,7 @@
 setup(
     name                 = 'pwntools',
     packages             = find_packages(),
-    version              = '3.2.0dev',
+    version              = '3.3.0dev',
     data_files           = [('',
                              glob.glob('*.md') + glob.glob('*.txt')),
                             ],