diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4479ee22790..1c164f2d214 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-02-17 Teodor Zlatanov <tzz@lifelogs.com> + + * net/gnutls.el (gnutls-trustfiles): Fixed Cygwin bundle location. + 2012-02-17 Glenn Morris <rgm@gnu.org> * net/socks.el: Require network-stream. (Bug#10599) diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 2fd276cf1c6..1bc319c796e 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -56,7 +56,7 @@ set this variable to \"normal:-dhe-rsa\"." "/etc/ssl/certs/ca-certificates.crt" ; Debian, Ubuntu, Gentoo and Arch Linux "/etc/pki/tls/certs/ca-bundle.crt" ; Fedora and RHEL "/etc/ssl/ca-bundle.pem" ; Suse - "/usr/ssl/cert/ca-bundle.crt" ; Cygwin + "/usr/ssl/certs/ca-bundle.crt" ; Cygwin ) "List of CA bundle location filenames or a function returning said list. The files may be in PEM or DER format, as per the GnuTLS documentation. |