Merge branch 'master' into malloc
Merge branch 'master' into malloc
Merge branch 'master' into malloc

Conflicts:
	src/regress/lib/libcrypto/chacha/chachatest.c
insert chachatest again
resolving merge conflicts still not that easy
Merge branch 'master' into malloc
some adjustment
	modified:   ../../../../patches/malloc/amd-malloc.patch
	modified:   info_hes.c
	modified:   nfs_start.c
amd changes
hexdump update
alignment fixed
Merge branch 'malloc' into master-experimental

Conflicts:
	src/regress/lib/libcrypto/chacha/chachatest.c
update deleting changes
	modified:   chachatest.c