summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cut 2.1.22.1.2Jeff Forcier2017-02-202-1/+2
* Merge branch '2.0' into 2.1Jeff Forcier2017-02-202-1/+4
|\
| * Main release module configures the tasks to hide stdout, undo thatJeff Forcier2017-02-201-1/+1
| * Cut 2.0.52.0.5Jeff Forcier2017-02-202-1/+2
| * Cut 1.18.2Jeff Forcier2017-02-201-0/+1
| * Cut 1.17.4Jeff Forcier2017-02-201-0/+1
* | Merge branch '2.0' into 2.1Jeff Forcier2017-02-203-2/+24
|\ \ | |/
| * Changelog closes #853Jeff Forcier2017-02-201-0/+3
| * This is awful and I hate my lifeJeff Forcier2017-02-202-4/+17
| * Test proving #853, fails on Python 3 but not 2Jeff Forcier2017-02-201-0/+6
| * FormattingJeff Forcier2017-02-201-1/+2
* | Merge branch '1.18' into 2.1Jeff Forcier2017-02-201-1/+2
|\ \
| * \ Merge branch '1.17' into 1.18Jeff Forcier2017-02-201-1/+2
| |\ \
| | * | FormattingJeff Forcier2017-02-201-1/+2
* | | | Merge branch '1.18' into test-branchJeff Forcier2017-02-201-14/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-02-201-1/+0
| |\ \ \ | | |/ /
| | * | Pretty sure adding PyPy test cell to pre-2.0 was unintentional.Jeff Forcier2017-02-201-1/+0
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-02-202-2/+9
| |\ \ \ | | |/ /
| | * | Changelog closes #863Jeff Forcier2017-02-201-0/+3
| | * | Avoid PacketizerTest.test_closed_3 to fail on platforms where errno.ETIMESofian Brabez2017-02-201-2/+6
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-02-201-2/+2
| |\ \ \ | | |/ /
| | * | SighJeff Forcier2017-02-201-2/+2
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-02-203-0/+13
| |\ \ \ | | |/ /
| | * | Changelog closes #44, closes #891Jeff Forcier2017-02-201-0/+7
| | * | Add back-reference from Transport to the SSHClient that created itOmer Anson2017-02-202-0/+6
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-02-201-1/+1
| |\ \ \ | | |/ /
| | * | let's be consistentJeff Forcier2017-02-201-1/+1
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-02-201-24/+25
| |\ \ \ | | |/ /
| | * | Update a whole bunch of changelog entries lacking proper version statements =/Jeff Forcier2017-02-201-24/+25
| * | | Correctly mark #859 as being in 1.18 on upJeff Forcier2017-02-201-2/+2
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-02-203-15/+8
| |\ \ \ | | |/ /
| | * | Changelog re #713, re #714, re #889Jeff Forcier2017-02-201-0/+5
| | * | Merge branch '1.17' into 889-intJeff Forcier2017-02-203-15/+6
| | |\ \
| | | * | Also make this self-referential because jeezJeff Forcier2017-02-201-1/+1
| | | * | Correct get_text() docstringJeff Forcier2017-02-201-3/+1
| | | * | Not sure how these snuck back inJeff Forcier2017-02-201-9/+0
| | | * | Nuke old commented out lineJeff Forcier2017-02-201-1/+0
| | * | | Don't pass IV to pycrypto when using MODE_CTRjhall1502017-02-081-1/+1
| * | | | Merge branch '1.17' into 1.18Jeff Forcier2017-02-192-1/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Changelog re #895, closes #895Jeff Forcier2017-02-191-0/+3
| | * | | Fix bug in handling multiple interactive queriesDennis Kaarsemaker2017-02-191-1/+1
| | |/ /
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-02-031-0/+1
| |\ \ \ | | |/ /
| | * | Update .travis.ymlKalle Møller2017-02-031-0/+1
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-01-251-1/+1
| |\ \ \ | | |/ /
| | * | Added bytes as type to writeKalle Møller2017-01-251-1/+1
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-01-2410-13/+13
| |\ \ \ | | |/ /
| | * | untie agian!james mike dupont2017-01-2410-13/+13
| * | | Merge branch '1.17' into 1.18Jeff Forcier2017-01-181-1/+1
| |\ \ \ | | |/ /
| | * | Update channel.pyJames Michael DuPont2017-01-181-1/+1
* | | | Merge branch '2.0' into 2.1Jeff Forcier2017-02-202-2/+9
|\ \ \ \ | | |_|/ | |/| |