From c6f8e8086cb32ec88ad87a8fa36d9f5eb6f9824d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 26 Mar 2021 12:03:29 +0000
Subject: [PATCH]  1.30.1

---
 CHANGES.md              | 19 +++++++++++++++++++
 changelog.d/9697.docker |  1 -
 changelog.d/9697.misc   |  1 -
 debian/changelog        |  6 ++++++
 synapse/__init__.py     |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/9697.docker
 delete mode 100644 changelog.d/9697.misc

diff --git a/CHANGES.md b/CHANGES.md
index 1bf9514ac2..f371f756de 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,22 @@
+Synapse 1.30.1 (2021-03-26)
+===========================
+
+This is a security release to ensure that Synapse is running with a
+`cryptography` package built against a patched version of OpenSSL.
+
+
+Updates to the Docker image
+---------------------------
+
+- Ensure that the docker container has up to date versions of openssl. ([\#9697](https://github.com/matrix-org/synapse/issues/9697))
+
+
+Internal Changes
+----------------
+
+- Enforce that `cryptography` dependency is up to date to ensure it has the most recent openssl patches. ([\#9697](https://github.com/matrix-org/synapse/issues/9697))
+
+
 Synapse 1.30.0 (2021-03-22)
 ===========================
 
diff --git a/changelog.d/9697.docker b/changelog.d/9697.docker
deleted file mode 100644
index fb06ef6c48..0000000000
--- a/changelog.d/9697.docker
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that the docker container has up to date versions of openssl.
diff --git a/changelog.d/9697.misc b/changelog.d/9697.misc
deleted file mode 100644
index e4866b01fa..0000000000
--- a/changelog.d/9697.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enforce that `cryptography` dependency is up to date to ensure it has the most recent openssl patches.
diff --git a/debian/changelog b/debian/changelog
index e6b2122d6f..18dc04cd82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.30.1) stable; urgency=medium
+
+  * New synapse release 1.30.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 26 Mar 2021 12:01:28 +0000
+
 matrix-synapse-py3 (1.30.0) stable; urgency=medium
 
   * New synapse release 1.30.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 8e57739cd2..c9bc8fb9e9 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.30.0"
+__version__ = "1.30.1"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when