Merged rt31459d (openssl random)

diff --cc bin/dnssec/dnssec-signzone.c
Simple merge

diff --cc bin/dnssec/dnssectool.c
Simple merge

diff --cc bin/named/server.c
Simple merge

diff --cc bin/nsupdate/nsupdate.c
Simple merge

diff --cc bin/tools/mdig.c
Simple merge

diff --cc lib/dns/win32/libdns.def.in
Simple merge

diff --cc lib/isc/pk11.c
Simple merge