From 3dd6ba135ea37655b70b4099d9c3e0cadada9e1d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 13 Jan 2021 10:19:12 +0000
Subject:  1.25.0

---
 CHANGES.md | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'CHANGES.md')

diff --git a/CHANGES.md b/CHANGES.md
index 9135c4f713..aaded5bd24 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+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)
 ==============================
 
-- 
cgit 1.4.1