| commit | a8a3afbee22d774be2938c4fb30d8340b47a4f37 | [log] [tgz] |
|---|---|---|
| author | michael-hart <michael.hart1994@gmail.com> | Fri Sep 26 09:03:02 2014 +0100 |
| committer | michael-hart <michael.hart1994@gmail.com> | Fri Sep 26 09:03:02 2014 +0100 |
| tree | c48106fb62282aecad32d088ce931826a2b47c77 | |
| parent | 606f5f6b3158e8e5ee116f16315ca99fd3d9b53f [diff] | |
| parent | b53fab7d3db4a7b75c0703d3b6f8add69e097bfe [diff] |
Merge branch 'public_key_pem' of https://github.com/michael-hart/cryptography into public_key_pem Conflicts: cryptography/hazmat/backends/openssl/backend.py tests/hazmat/primitives/test_serialization.py