From 51717970261d6283b681f5fa8347808409f0991d Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Wed, 29 Sep 2021 06:56:51 +0800
Subject: 21.0.0 release (#1041)

---
 CHANGELOG.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG.rst')

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 85fb1c3..a4414f1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,7 +4,7 @@ Changelog
 Versions are year-based with a strict backward-compatibility policy.
 The third digit is only for regressions.
 
-21.0.0 (UNRELEASED)
+21.0.0 (2020-09-28)
 -------------------
 
 Backward-incompatible changes:
@@ -23,6 +23,8 @@ Changes:
   `#993 <https://github.com/pyca/pyopenssl/pull/993>`_
 - Added ``OpenSSL.SSL.Context.set_min_proto_version`` and ``OpenSSL.SSL.Context.set_max_proto_version``
   to set the minimum and maximum supported TLS version `#985 <https://github.com/pyca/pyopenssl/pull/985>`_.
+- Updated ``to_cryptography`` and ``from_cryptography`` methods to support an upcoming release of ``cryptography`` without raising deprecation warnings.
+  `#1030 <https://github.com/pyca/pyopenssl/pull/1030>`_
 
 20.0.1 (2020-12-15)
 -------------------
-- 
cgit v1.2.1