| commit | 279909731305d97681a30172a0675a6e362feed5 | [log] [tgz] |
|---|---|---|
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | Thu Apr 17 17:53:12 2014 -0400 |
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | Thu Apr 17 17:53:12 2014 -0400 |
| tree | f5fd2c7eb1125e56965e8b8ffe4b94ecb013cd48 | |
| parent | cc30c93a5fa15490820b5786b2d336a2c4dde5f1 [diff] | |
| parent | 93231c8f146380cc846e118c6f288d0d6eb950d9 [diff] |
Merge remote-tracking branch 'pyca/master' into ecdhe