4 files changed, 16 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 9135c4f713..aaded5bd24 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,13 @@
Synapse 1.25.0 (2021-01-13)
+===========================
+
+Bugfixes
+--------
+
+- Fix HTTP proxy support when using a proxy that is on a blacklisted IP. Introduced in v1.25.0rc1. Contributed by @Bubu. ([\#9084](https://github.com/matrix-org/synapse/issues/9084))
+
+
+Synapse 1.25.0 (2021-01-13)
==============================
Ending Support for Python 3.5 and Postgres 9.5
diff --git a/changelog.d/9084.bugfix b/changelog.d/9084.bugfix
deleted file mode 100644
index 415dd8b259..0000000000
--- a/changelog.d/9084.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Don't blacklist connections to the configured proxy. Contributed by @Bubu.
diff --git a/debian/changelog b/debian/changelog
index 601036ef56..609436bf75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-matrix-synapse-py3 (1.24.0+nmu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.25.0) stable; urgency=medium
+ [ Dan Callahan ]
* Update dependencies to account for the removal of the transitional
dh-systemd package from Debian Bullseye.
- -- Dan Callahan <danc@element.io> Tue, 12 Jan 2021 12:08:33 +0000
+ [ Synapse Packaging team ]
+ * New synapse release 1.25.0.
+
+ -- Synapse Packaging team <packages@matrix.org> Wed, 13 Jan 2021 10:14:55 +0000
matrix-synapse-py3 (1.24.0) stable; urgency=medium
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 99fb675748..193adca624 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
except ImportError:
pass
-__version__ = "1.25.0rc1"
+__version__ = "1.25.0"
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
|
