Release 4.5.0beta0

Author: Arusekk

CHANGELOG.md

@@ -9,9 +9,11 @@ The table below shows which release corresponds to each branch, and what date th
 
 | Version          | Branch   | Release Date           |
 | ---------------- | -------- | ---------------------- |
-| [4.5.0](#450)    | `dev`    | Dec 20, 2020 (planned)
-| [4.4.0](#440)    | `beta`   | Nov 20, 2020 (planned)
-| [4.3.0](#430)    | `stable` | Oct 20, 2020
+| [4.6.0](#460)    | `dev`    | May 29, 2020 (planned)
+| [4.5.0](#450)    | `beta`   | Apr 29, 2020 (planned)
+| [4.4.0](#440)    | `stable` | Mar 29, 2020
+| [4.3.1](#431)    |          | Nov 29, 2020
+| [4.3.0](#430)    |          | Oct 20, 2020
 | [4.2.0](#420)    |          | Jul 3, 2020
 | [4.1.7](#417)    |          | Jun 30, 2020
 | [4.1.5](#415)    |          | Jun 27, 2020
@@ -56,7 +58,11 @@ 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
 
-## 4.5.0 (`dev`)
+## 4.6.0 (`dev`)
+
+
+
+## 4.5.0 (`beta`)
 
 - [#1261][1261] Misc `run_in_new_terminal` improvements (notably gdb terminated by default)
 - [#1695][1695] Allow using GDB Python API
@@ -82,16 +88,24 @@ The table below shows which release corresponds to each branch, and what date th
 [1757]: https://github.com/Gallopsled/pwntools/pull/1757
 [1758]: https://github.com/Gallopsled/pwntools/pull/1758
 [1780]: https://github.com/Gallopsled/pwntools/pull/1780
+<<<<<<< HEAD
 
 [1941]: https://github.com/Gallopsled/pwntools/pull/1941
 
+=======
+[1941]: https://github.com/Gallopsled/pwntools/pull/1941
+>>>>>>> stable
 [1811]: https://github.com/Gallopsled/pwntools/pull/1811
 [1827]: https://github.com/Gallopsled/pwntools/pull/1827
 [1841]: https://github.com/Gallopsled/pwntools/pull/1841
 [1839]: https://github.com/Gallopsled/pwntools/pull/1839
 [1833]:  https://github.com/Gallopsled/pwntools/pull/1833
 
+<<<<<<< HEAD
 ## 4.4.0 (`beta`)
+=======
+## 4.4.0 (`stable`)
+>>>>>>> stable
 
 - [#1541][1541] Use `context.newline` for tubes by default
 - [#1602][1602] Fix bytes handling in ssh tubes
@@ -135,7 +149,7 @@ The table below shows which release corresponds to each branch, and what date th
 [1703]: https://github.com/Gallopsled/pwntools/pull/1703
 [1704]: https://github.com/Gallopsled/pwntools/pull/1704
 
-## 4.3.1 (`stable`)
+## 4.3.1
 
 - [#1732][1732] Fix shellcraft SSTI vulnerability (first major pwntools vuln!)
 

pwnlib/version.py

@@ -1 +1 @@
-__version__ = '4.5.0dev'
+__version__ = '4.5.0beta0'

setup.py

@@ -88,7 +88,7 @@
     name                 = 'pwntools',
     python_requires      = '>=2.7',
     packages             = find_packages(),
-    version              = '4.5.0dev',
+    version              = '4.5.0beta0',
     data_files           = [('pwntools-doc',
                              glob.glob('*.md') + glob.glob('*.txt')),
                             ],