Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '2.2' into 2.32.3 | Jeff Forcier | 2020-01-10 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch '2.1' into 2.22.2 | Jeff Forcier | 2020-01-10 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch '2.0' into 2.12.1 | Jeff Forcier | 2020-01-10 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Last ever LICENSE copyright update2.0 | Jeff Forcier | 2020-01-10 | 1 | -2/+2 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2019-06-21 | 1 | -0/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | GSSAPI related kwargs were never docstring-documented -_- | Jeff Forcier | 2019-06-21 | 1 | -0/+8 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2019-06-21 | 1 | -2/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Blacken | Jeff Forcier | 2019-06-21 | 1 | -2/+6 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2019-06-21 | 5 | -3/+33 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add new keys and tests proving #1306 | Jeff Forcier | 2019-06-21 | 3 | -0/+23 |
| * | | | Changelog re #1306 | Jeff Forcier | 2019-06-21 | 1 | -0/+5 |
| * | | | fix ed25519 ssh key unpad() when padding not present (not needed) | Pierce Lopez | 2019-06-21 | 1 | -3/+5 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2019-06-14 | 1 | -3/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2019-06-14 | 1 | -3/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2019-06-14 | 1 | -3/+0 |
| | |\ \ | | | |/ | |||||
| | | * | Seriously? | Jeff Forcier | 2019-06-14 | 1 | -3/+0 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2019-06-14 | 3 | -15/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2019-06-14 | 3 | -15/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2019-06-14 | 3 | -15/+9 |
| | |\ \ | | | |/ | |||||
| | | * | Update to modern pytest(-relaxed) | Jeff Forcier | 2019-06-14 | 3 | -15/+9 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2019-05-31 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2019-05-31 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2019-05-31 | 1 | -0/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Never added 3.7 classifier | Jeff Forcier | 2019-05-31 | 1 | -0/+1 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2019-05-31 | 2 | -1/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2019-05-31 | 2 | -1/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2019-05-31 | 2 | -1/+9 |
| | |\ \ | | | |/ | |||||
| | | * | Changelog re #1378, closes #1378 | Jeff Forcier | 2019-05-31 | 1 | -0/+4 |
| | | * | import MutableMapping from collections.abc instead of collections | Josh Karpel | 2019-05-31 | 1 | -1/+5 |
* | | | | Rename confusing CRYPTO_BEFORE variable. | Jeff Forcier | 2019-05-31 | 1 | -4/+4 |
* | | | | Not sure why this got reverted in 2.3 | Jeff Forcier | 2018-12-15 | 1 | -2/+2 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2018-12-15 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2018-12-15 | 1 | -2/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-12-15 | 1 | -2/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Grumble | Jeff Forcier | 2018-12-15 | 1 | -2/+4 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2018-12-14 | 1 | -4/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2018-12-14 | 1 | -4/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-12-14 | 1 | -4/+3 |
| | |\ \ | | | |/ | |||||
| | | * | More 2.6/3.3 related dep tweaks | Jeff Forcier | 2018-12-14 | 1 | -4/+3 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2018-12-14 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2018-12-14 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-12-14 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | pycparser 2.19 dropped Python 2.6, 3.3 | Jeff Forcier | 2018-12-14 | 1 | -0/+2 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2018-12-14 | 2 | -5/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2018-12-14 | 2 | -5/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-12-14 | 2 | -5/+10 |
| | |\ \ | | | |/ | |||||
| | | * | Backport some minor formatting tweaks from 2.4.x | Jeff Forcier | 2018-12-14 | 2 | -5/+10 |
* | | | | Merge branch '2.2' into 2.3 | Jeff Forcier | 2018-12-14 | 5 | -16/+18 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '2.1' into 2.2 | Jeff Forcier | 2018-12-14 | 5 | -16/+18 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '2.0' into 2.1 | Jeff Forcier | 2018-12-14 | 5 | -16/+18 |
| | |\ \ | | | |/ |