diff --git a/CHANGELOG.md b/CHANGELOG.md index 6017576de..c524eb412 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -72,6 +72,7 @@ The table below shows which release corresponds to each branch, and what date th - [#1675][1675] Gdbserver now correctly accepts multiple libraries in `LD_PRELOAD` and `LD_LIBRARY_PATH` - [#1678][1678] ROPGadget multibr - [#1682][1682] ROPGadget multibr fix +- [#1687][1687] Actually import `requests` when doing `from pwn import *` - [#1688][1688] Add `__setattr__` and `__call__` interfaces to `ROP` for setting registers - [#1692][1692] Remove python2 shebangs where appropriate @@ -88,6 +89,7 @@ The table below shows which release corresponds to each branch, and what date th [1675]: https://github.com/Gallopsled/pwntools/pull/1675 [1678]: https://github.com/Gallopsled/pwntools/pull/1678 [1682]: https://github.com/Gallopsled/pwntools/pull/1679 +[1687]: https://github.com/Gallopsled/pwntools/pull/1687 [1688]: https://github.com/Gallopsled/pwntools/pull/1688 [1692]: https://github.com/Gallopsled/pwntools/pull/1692 diff --git a/pwn/toplevel.py b/pwn/toplevel.py index 67f4350c0..9b253e802 100644 --- a/pwn/toplevel.py +++ b/pwn/toplevel.py @@ -5,6 +5,7 @@ import operator import os import re +import requests import socks import signal import string