summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2014-03-29 18:19:36 -0400
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2014-03-29 18:19:36 -0400
commitb13ce3183fed73cc126ec078b08bd1e329f4e2e0 (patch)
tree8fe0de4ec04054bc4e0f5c7c70e1a735597c708a /ChangeLog
parentab04bdcb04a32eb95e13086891e313706358b2ea (diff)
parent60904655cd24e09c4b4334052b44a0e138a73ef1 (diff)
downloadpyopenssl-b13ce3183fed73cc126ec078b08bd1e329f4e2e0.tar.gz
merge master
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b31cc9..b0fd98a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
* OpenSSL/SSL.py: Add ``get_cipher_name``, ``get_cipher_bits``,
and ``get_cipher_version`` to ``Connection``.
+2014-03-28 Jean-Paul Calderone <exarkun@twistedmatrix.com>
+
+ * OpenSSL/tsafe.py: Replace the use of ``apply`` (which has been
+ removed in Python 3) with the equivalent syntax.
+
2014-03-02 Stephen Holsapple <sholsapp@gmail.com>
* OpenSSL/crypto.py: Add ``get_extensions`` method to ``X509Req``.