From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 11 Apr 2016 16:07:16 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/7b45cc583c4f16cc070a9925431ca944f510a685

; Merge from origin/emacs-25

The following commits were skipped:

0d7aad1 Revert "Backport HTTPS proxy fix"
2d1a605 Backport HTTPS proxy fix
---

7b45cc583c4f16cc070a9925431ca944f510a685