Skip to content

Commit

Permalink
Release 3.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
TethysSvensson committed Jan 3, 2018
1 parent 953e73a commit d689805
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
11 changes: 5 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ The table below shows which release corresponds to each branch, and what date th

| Version | Branch | Release Date |
| ---------------- | -------- | ---------------------- |
| [3.12.0](#3120) | `dev` | Jan 13, 2018 (planned)
| [3.11.0](#3110) | `beta` | Dec 2, 2017 (planned)
| [3.10.0](#3100) | `stable` | Oct 25, 2017
| [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.10.0](#3100) | | Oct 25, 2017
| [3.9.2](#392) | | Oct 5, 2017
| [3.9.1](#391) | | Sep 28, 2017
| [3.9.0](#390) | | Sep 11, 2017
Expand Down Expand Up @@ -42,7 +43,7 @@ The table below shows which release corresponds to each branch, and what date th

## 3.12.0

To be released on Jan 13, 2018.
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
Expand All @@ -61,8 +62,6 @@ To be released on Jan 13, 2018.

## 3.11.0

To be released on Dec 2, 2017.

- [#1044][1044] Enhancements to ROP
+ Much better support for 64-bit Intel (amd64) ROP
+ ROP gadget selection is optimized to favor multi-pops instead of multiple single-pop gadgets
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.0-green.svg?style=flat)](https://pypi.python.org/pypi/pwntools/)
[![PyPI](https://img.shields.io/badge/pypi-v3.11.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)
Expand Down
2 changes: 1 addition & 1 deletion pwnlib/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.11.0beta0'
__version__ = '3.11.0'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
setup(
name = 'pwntools',
packages = find_packages(),
version = '3.11.0beta0',
version = '3.11.0',
data_files = [('',
glob.glob('*.md') + glob.glob('*.txt')),
],
Expand Down

0 comments on commit d689805

Please sign in to comment.