Merge branch 'countermeasures' into alex-and-isaac

diff --cc include/extern.h
index 9475468397a666079033597e45f785450f594a0b,24df9cd6ac2980e96985a5fe7158e616a3fc4405..7e48246f5b1c07c0388a81e60ddfda5c1b5e5041
--- 1/include/extern.h
--- 2/include/extern.h
+++ b/include/extern.h
@@@ -2103,8 -2104,11 +2104,12 @@@ E void FDECL(genl_outrip, (winid, int, 
  
  /* ### rnd.c ### */
  
+ #ifdef USE_ISAAC64
+ E void FDECL(init_isaac64, (unsigned long));
+ E long NDECL(nhrand);
+ #endif
  E int FDECL(rn2, (int));
 +E int FDECL(rn2_on_display_rng, (int));
  E int FDECL(rnl, (int));
  E int FDECL(rnd, (int));
  E int FDECL(d, (int, int));

diff --cc src/rnd.c
Simple merge

diff --cc src/rumors.c
Simple merge