diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 16:55:40 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-16 16:55:40 -0700 |
| commit | e761f8b33519104605b14cf8a24e9f68bd23b624 (patch) | |
| tree | 672968fa7c23790bc9f5c9cd3c779adce09fae8c /AUTHORS.rst | |
| parent | 62ebc7e212a92a13c3836de5d129cb93f40a128d (diff) | |
| parent | 169dee88faa7c46b5551b89cf97a1b30c0a1c6ea (diff) | |
| download | cryptography-e761f8b33519104605b14cf8a24e9f68bd23b624.tar.gz cryptography-e761f8b33519104605b14cf8a24e9f68bd23b624.tar.bz2 cryptography-e761f8b33519104605b14cf8a24e9f68bd23b624.zip | |
Merge branch 'master' into triple-des
Also moved most of the tests to the new format except for one which doesn't yet
have an obvious translation
Conflicts:
cryptography/primitives/block/ciphers.py
tests/primitives/test_nist.py
Diffstat (limited to 'AUTHORS.rst')
| -rw-r--r-- | AUTHORS.rst | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst index 9d499dc7..b3b7f35d 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,10 +1,13 @@ AUTHORS ======= -* Alex Gaynor <alex.gaynor@gmail.com> +PGP key fingerprints are enclosed in parentheses. + +* Alex Gaynor <alex.gaynor@gmail.com> (E27D 4AA0 1651 72CB C5D2 AF2B 125F 5C67 DFE9 4084) * Hynek Schlawack <hs@ox.cx> * Donald Stufft <donald@stufft.io> * Laurens Van Houtven <_@lvh.io> * Christian Heimes <christian@python.org> * Paul Kehrer <paul.l.kehrer@gmail.com> +* Jarret Raim <jarito@gmail.com> |