Trivial merge.

ChangeLog

@@ -18,6 +18,11 @@
 
 	* configure.ac (enable_shared): Build shared libraries by default.
 
+2012-03-04  Niels Möller  <nisse@lysator.liu.se>
+
+	* configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.4.
+	(LIBHOGWEED_MINOR): And to 2.2.
+
 2012-02-27  Niels Möller  <nisse@lysator.liu.se>
 
 	* list-obj-sizes.awk: Recognize elf64 objects.

NEWS

+NEWS for the 2.5 release
+
+	* Various portability fixes for MacOS and M$ Windows. A lot of
+	  this work done by Martin Storsjö.
+
+	* In particular, Nettle now hopefully works on 64-bit Windows
+	  builds, "W64", including the x86_64 assemby code.
+
+	* Documentation for the base16 and base64 functions. Was
+	  contributed by Jeronimo Pellegrini back in 2006, but
+	  unfortunately forgotten until now.
+
+	* The nettle repository has been migrated from cvs to git,
+	  with a public repository at
+	  http://git.lysator.liu.se/nettle. To make it independent of
+	  the LSH repository, a few files have been moved around.
+	  While at it, files have also been converted from latin-1 to
+	  utf-8.
+
+	The libraries are intended to be binary compatible with
+	nettle-2.2 and later. The shared library names are
+	libnettle.so.4.4 and libhogweed.so.2.2, with sonames still
+	libnettle.so.4 and libhogweed.so.2
+
 NEWS for the 2.4 release
 
 	This is a bugfix release only. It turned out ripemd160 in the

README

@@ -32,7 +32,7 @@ Build nettle with the usual ./configure && make && make check && make
 install. Read the manual. Mail me if you have any questions or
 suggestions.
 
-You can also build Nettle from cvs, see
+You can also build Nettle from git, see
 http://www.lysator.liu.se/~nisse/nettle/ for current instructions.
 
 You may want to subscribe to the nettle-bugs mailing list. See

configure.ac

@@ -11,10 +11,10 @@ AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_HEADER([config.h])
 
 LIBNETTLE_MAJOR=4
-LIBNETTLE_MINOR=3
+LIBNETTLE_MINOR=4
 
 LIBHOGWEED_MAJOR=2
-LIBHOGWEED_MINOR=1
+LIBHOGWEED_MINOR=2
 
 AC_CANONICAL_HOST