master now holds the 3.4.0 release

diff --git a/NEWS b/NEWS
index 227f79ae05508099b1c3a7d672e8583326d8b3a0..e24f99ac7eec825976baa1cf447adbd5c1d60f01 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,10 +3,9 @@ Copyright (C) 2000-2014 Free Software Foundation, Inc.
 Copyright (C) 2013, 2014 Nikos Mavrogiannopoulos
 See the end for copying conditions.
 
-* Version 3.3.6 (unreleased)
+* Version 3.4.0 (unreleased)
 
-** libgnutls: bundle replacements of inet_pton and inet_aton if not
-available.
+** libgnutls: Use pthread_atfork() to detect fork.
 
 ** API and ABI modifications:
 No changes since last version.

diff --git a/configure.ac b/configure.ac
index eef6c9fefcd8012ac2591d6b1673c422e5536467..fe6f8ea3d8b5ff676b689c0d242dead7aaae3453 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.3.6], [bugs@gnutls.org])
+AC_INIT([GnuTLS], [3.4.0], [bugs@gnutls.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST