summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2016-04-06 18:36:18 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2016-04-06 18:36:18 +0200
commit0d7aad1b30de7e9deb8b3c7011d9b679e538371c (patch)
treefcec0d4ae33eac780b308b45b5b5044b6f942353 /etc
parent2d1a6054b161bd1055d4feb11c8c5ac95543f5db (diff)
downloademacs-0d7aad1b30de7e9deb8b3c7011d9b679e538371c.tar.gz
Revert "Backport HTTPS proxy fix"
This reverts commit 2d1a6054b161bd1055d4feb11c8c5ac95543f5db. It's too late in the Emacs 25 release cycle to add things like this to Emacs 25.1. It's border line new feature.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS2
1 files changed, 0 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 7ed617b7575..95265882ec3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -933,8 +933,6 @@ variable, meaning you can bind it around an 'url-retrieve' call.
plist will contain a :peer element that has the output of
'gnutls-peer-status' (if Emacs is built with GnuTLS support).
-*** The URL package now support https over proxies supporting CONNECT.
-
** Tramp
+++