Merge branch 'master' of git.lysator.liu.se:/nettle/nettle

diff --cc ChangeLog
index 9a0cc5f2bb7cd2a876c8e8343083f1a4980028a1,0ca8a7c15a97e0501400d98ac5a8feed850ed4c2..3a357caff9594eee31caa6a93b79b4f8d53c5d7e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,19 +1,24 @@@
 +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.
+ 
+       * Makefile.in (.texinfo.dvi): Pass -b option to texi2dvi.
+ 
+       * Makefile.in (TARGETS): Added twofishdata.
+       (SOURCES): Added twofishdata.c.
+       (twofishdata): New rule.
+ 
+       * twofish.c (q0, q1): Made const, and reformatted to match the
+       twofishdata program.
+ 
+       * twofishdata.c: Resurrected old file. Used to be called
+       generate_q.c, when the twofish code was contributed back in 1999.
+ 
        * nettle.texinfo: Documentation for base16 and base64 encoding.
        Text contributed by Jeronimo Pellegrini
        <pellegrini@mpcnet.com.br>, back in April 2006.