1 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 937b96107bc..829895d1b72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * gnutls.c (init_gnutls_functions): Load gnutls_check_version.
+        Load gnutls_transport_set_lowat only if GnuTLS version is below
+        2.11.1.
+        (emacs_gnutls_handshake): Call gnutls_transport_set_lowat only for
+        GnuTLS versions below 2.11.1.
+
 2011-12-31  Antoine Levitt  <antoine.levitt@gmail.com>
 
         * xdisp.c (syms_of_xdisp) <window-scroll-functions>: Add warning