update from anoncvs
automerge master into master-experimental

Conflicts:
	src/regress/lib/libcrypto/chacha/chachatest.c