clear memory to avoid CVE-2014-0160 (Heartbleed)
Merge branch 'master' of github.com:miraculixx/openssl

Conflicts:
	ssl/t1_lib.c