From 232b324c38b3914509550aa895b791a33874c915 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:48:42 +0000
Subject: Port "Add support for no_proxy and case insensitive env variables"
 from mainline to dinsic (#93)

This PR is simply porting https://github.com/matrix-org/synapse/pull/9372 to dinsic.

I also had to bring in https://github.com/matrix-org/synapse/pull/8821 and https://github.com/matrix-org/synapse/pull/9084 for this code to work properly - a sign that we should merge mainline into dinsic again soon.
---
 changelog.d/9084.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/9084.bugfix

(limited to 'changelog.d/9084.bugfix')

diff --git a/changelog.d/9084.bugfix b/changelog.d/9084.bugfix
new file mode 100644
index 0000000000..415dd8b259
--- /dev/null
+++ b/changelog.d/9084.bugfix
@@ -0,0 +1 @@
+Don't blacklist connections to the configured proxy. Contributed by @Bubu.
-- 
cgit 1.5.1