summaryrefslogtreecommitdiffhomepage
AgeCommit message (Expand)Author
2017-02-20Merge branch '2.1'Jeff Forcier
2017-02-20Merge branch '2.0' into 2.1Jeff Forcier
2017-02-20Not sure how this got overlooked in the cherrypicking, ugh @ myselfJeff Forcier
2017-02-20Merge branch '2.1'Jeff Forcier
2017-02-20Merge branch '2.0' into 2.1Jeff Forcier
2017-02-20Update a whole bunch of changelog entries lacking proper version statements =/Jeff Forcier
2017-02-20Merge branch '1.17' into 1.18Jeff Forcier
2017-02-20Update a whole bunch of changelog entries lacking proper version statements =/Jeff Forcier
2017-02-20Correctly mark #859 as being in 1.18 on upJeff Forcier
2017-02-20Merge branch '2.1'Jeff Forcier
2017-02-20Merge branch '2.0' into 2.1Jeff Forcier
2017-02-20Changelog re #713, re #714, re #889Jeff Forcier
2017-02-20Merge branch '1.17' into 1.18Jeff Forcier
2017-02-20Changelog re #713, re #714, re #889Jeff Forcier
2017-02-20Merge branch '1.17' into 889-intJeff Forcier
2017-02-20Also make this self-referential because jeezJeff Forcier
2017-02-20Correct get_text() docstringJeff Forcier
2017-02-20Not sure how these snuck back inJeff Forcier
2017-02-20Nuke old commented out lineJeff Forcier
2017-02-19Merge branch '2.1'Jeff Forcier
2017-02-19Merge branch '2.0' into 2.1Jeff Forcier
2017-02-19Changelog re #895, closes #895Jeff Forcier
2017-02-19Fix bug in handling multiple interactive queriesDennis Kaarsemaker
2017-02-19Merge branch '1.17' into 1.18Jeff Forcier
2017-02-19Changelog re #895, closes #895Jeff Forcier
2017-02-19Fix bug in handling multiple interactive queriesDennis Kaarsemaker
2017-02-08Don't pass IV to pycrypto when using MODE_CTRjhall150
2017-02-03Merge branch '2.1'Jeff Forcier
2017-02-03Merge branch '2.0' into 2.1Jeff Forcier
2017-02-03Update .travis.ymlKalle Møller
2017-02-03Merge branch '1.17' into 1.18Jeff Forcier
2017-02-03Update .travis.ymlKalle Møller
2017-02-03Merge pull request #882 from KalleDK/patch-2Jeff Forcier
2017-02-01Update .travis.ymlKalle Møller
2017-01-25Merge branch '2.0' into 2.1Jeff Forcier
2017-01-25Merge branch '2.1'Jeff Forcier
2017-01-25Added bytes as type to writeKalle Møller
2017-01-25Merge branch '1.17' into 1.18Jeff Forcier
2017-01-25Added bytes as type to writeKalle Møller
2017-01-24Merge branch '2.0' into 2.1Jeff Forcier
2017-01-24Merge branch '2.1'Jeff Forcier
2017-01-24untie agian!james mike dupont
2017-01-24Merge branch '1.17' into 1.18Jeff Forcier
2017-01-24untie agian!james mike dupont
2017-01-18Merge branch '2.0' into 2.1Jeff Forcier
2017-01-18Merge branch '2.1'Jeff Forcier
2017-01-18Update channel.pyJames Michael DuPont
2017-01-18Merge branch '1.17' into 1.18Jeff Forcier
2017-01-18Update channel.pyJames Michael DuPont
2017-01-01Merge branch '2.0' into 2.1Jeff Forcier