* 'master' of git.distorted.org.uk:~mdw/publish/public-git/catacomb: (53 commits)
rand/rand.c (rdrand_quick): Improve the loop.
configure.ac, rand/noise.c: Get high-res time from `clock_gettime'.
rand/noise.c: Make the high-res timer function be a bit more abstract.
configure.ac, Makefile.am: Collect libs only needed by Catcomb itself.
Makefile.am: Include $(PIXIE_LIBS) in the main library.
rand/noise.c (noise_devrandom): Use OpenBSD system call `getentropy'.
rand/noise.c (noise_devrandom): Use new Linux system call `getrandom'.
rand/noise.c (noise_devrandom): Handle Linux's broken `/dev/urandom'.
rand/noise.c (noise_devrandom): Refactor internals.
src/noise.c: Make `bitcount' table be static and constant.
rand/rand.c: Add support for x86 `RDRAND' instruction in `rand_quick'.
base/dispatch.[ch]: Detect availability of the x86 `RDRAND' instruction.
rand/rand.[ch]: Add external `rand_quick' function.
rand/: Secure `rand' generator against fork problems.
Release 2.2.2.
math/mp-arith.c (mp_testbit): Want nonstrict comparison for bounds check.
symm/salsa20-arm-neon.S: Mark the final-permutation stores as word-aligned.
symm/: Add ARM NEON implementations of ChaCha and Salsa20.
symm/{salsa20,chacha}-x86ish-sse2.S: Use numeric labels for internal loops.
symm/salsa20-x86ish-sse2.S: Fix stray `##' comment to be `//'.
...
Conflicts:
debian/changelog