From: Glenn Morris <rgm@gnu.org>
Date: Sun, 11 Jun 2017 23:20:41 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~521^2~123
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=933f91a36f97d8705919a77bdc1d011010e89fbb;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

16ef7539cb3 Don't advertise s_client in tls.el docs
94a6c964a45 Remove s_client usage from tls.el
---

933f91a36f97d8705919a77bdc1d011010e89fbb