diff options
| author | Matthias Witte <m.witte@telekom.de> | 2014-11-25 18:15:16 +0100 |
|---|---|---|
| committer | Matthias Witte <m.witte@telekom.de> | 2014-11-25 18:15:16 +0100 |
| commit | b3b0f2d0dff3aef736128935302aeb6adb1ee020 (patch) | |
| tree | 16d9fe959aede76a0a6ed4d1a6e59a90198dc6f8 /tox-requirements.txt | |
| parent | 47da1935dc84784bfee2e493474232bf2e0d8d37 (diff) | |
| parent | 838ab5b23274ddea0b5671b7f2d5a295dcd02dfe (diff) | |
Merge upstream branch 'master' into add_sha2_support
Conflicts:
paramiko/transport.py
tests/test_transport.py
Diffstat (limited to 'tox-requirements.txt')
0 files changed, 0 insertions, 0 deletions