From caa1ab3ac5c5096b20b69fac2e42cb67c6f716d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Mon, 24 Jun 2024 15:59:26 +0200
Subject: [PATCH] Update changelog for PR #1308 and #1310 (#1311)

---
 CHANGELOG.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 45975d15..81ed2c11 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,23 @@ Changelog
 Versions are year-based with a strict backward-compatibility policy.
 The third digit is only for regressions.
 
+24.2.0 (UNRELEASED)
+-------------------
+
+Backward-incompatible changes:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Deprecations:
+^^^^^^^^^^^^^
+
+Changes:
+^^^^^^^^
+
+- Added type hints for the ``SSL`` module.
+  `#1308 <https://github.com/pyca/pyopenssl/pull/1308>`_.
+- Changed ``OpenSSL.crypto.PKey.from_cryptography_key`` to accept public and private EC, ED25519, ED448 keys.
+  `#1310 <https://github.com/pyca/pyopenssl/pull/1310>`_.
+
 24.1.0 (2024-03-09)
 -------------------