Release 3.12.0

CHANGELOG.md

@@ -9,9 +9,10 @@ The table below shows which release corresponds to each branch, and what date th
 
 | Version          | Branch   | Release Date           |
 | ---------------- | -------- | ---------------------- |
-| [3.13.0](#3130)  | `dev`    | Mar 31, 2018 (planned)
-| [3.12.0](#3120)  | `beta`   | Feb 17, 2018 (planned)
-| [3.11.0](#3110)  | `stable` | Jan 3, 2018
+| [3.14.0](#3130)  | `dev`    | Jun 12, 2018 (planned)
+| [3.13.0](#3130)  | `beta`   | Mar 31, 2018 (planned)
+| [3.12.0](#3120)  | `stable` | Feb 22, 2018
+| [3.11.0](#3110)  |          | Jan 3, 2018
 | [3.10.0](#3100)  |          | Oct 25, 2017
 | [3.9.2](#392)    |          | Oct 5, 2017
 | [3.9.1](#391)    |          | Sep 28, 2017
@@ -41,8 +42,14 @@ The table below shows which release corresponds to each branch, and what date th
 | [3.0.0](#300)    |          | Aug 20, 2016
 | [2.2.0](#220)    |          | Jan 5, 2015
 
+## 3.14.0
+
+To be released on Jun 12, 2018.
+
 ## 3.13.0
 
+To be released on Mar 31, 2018.
+
 - [#1104][1104] Add `DynELF.dump()` for dumping remote ELF files
 - [#1101][1101] Set `context.os` via `context.binary`, useful for Android exploitation
 - [5fdc08][5fdc08] Work around broken `pidof` on Android
@@ -61,8 +68,6 @@ The table below shows which release corresponds to each branch, and what date th
 
 ## 3.12.0
 
-To be released on Feb 17, 2018.
-
 - [#1083][1083] Better error messages for `gdb` when `LD_PRELOAD` is incorrect
 - [#1085][1085] Add support for extracting Android `BOOTLDR!` images
 - [#1075][1075] Add support for detecting GNU Screen for `run_in_new_terminal`

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.11.0-green.svg?style=flat)](https://pypi.python.org/pypi/pwntools/)
+[![PyPI](https://img.shields.io/badge/pypi-v3.12.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.12.0beta0'
+__version__ = '3.12.0'

setup.py

@@ -86,7 +86,7 @@
 setup(
     name                 = 'pwntools',
     packages             = find_packages(),
-    version              = '3.12.0beta0',
+    version              = '3.12.0',
     data_files           = [('',
                              glob.glob('*.md') + glob.glob('*.txt')),
                             ],