2.29.18

diff --git a/NEWS b/NEWS
index 9884862..f710803 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+2.29.18
+=======
+  * gnutls: fixed two rehandshaking bugs; one in which a client
+    would erroneously report an error after successfully rehandshaking
+    (Igor Makarov, #653645), and one where initiating an asynchronous
+    rehandshake on the server side would send illegal packets and
+    cause the client to disconnect (Dan Winship).
+
+  * gnutls: made GTlsDatabaseGnutls and GTlsFileDatabaseGnutls
+    properly cancellable (Stef Walter)
+
+  * gnutls: fixed the client-side session cache to not share session
+    IDs between different virtual hosts on the same IP address, which
+    caused problems with some servers. (Dan Winship, #581342)
+
+  * tls: Fixed up the tls test program so it can be run from "make
+    check" (Stef Walter)
+
+  * New translations:
+       Persian
+
 2.29.15
 =======
   * gnutls: implement GTlsDatabase (Stef Walter, #636572)

diff --git a/configure.ac b/configure.ac
index 8d8e41f..154681e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.65)
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_INIT([glib-networking],[2.29.15],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network])
+AC_INIT([glib-networking],[2.29.18],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network])
 
 AC_CONFIG_SRCDIR([proxy/libproxy/glibproxyresolver.h])
 AC_CONFIG_HEADERS([config.h])
@@ -33,7 +33,7 @@ AM_GLIB_GNU_GETTEXT
 dnl *****************************
 dnl *** Check GLib GIO        ***
 dnl *****************************
-AM_PATH_GLIB_2_0(2.29.16,,AC_MSG_ERROR(GLIB not found),gio)
+AM_PATH_GLIB_2_0(2.29.18,,AC_MSG_ERROR(GLIB not found),gio)
 
 GIO_MODULE_DIR=$($PKG_CONFIG --variable giomoduledir gio-2.0)
 AS_IF([test "x$GIO_MODULE_DIR" = "x"],