compiles on mingw64 (BN_test, removed SSL_get_tlsa_record_byname)
partial ChaCha, fails TLS1.2 CHACHA cipher test
all tests passed
added ChaCha20 and Poly1305
merged latest upstream changes, patched sha compile issue
removed aes-256-gcm from speed test, fixed Makefile typo
updated libeay.num definitions
fixed chacha & poly1305 Makefiles for compiling with no-asm
fixed speed didn't show correct chacha20-poly1305 name
Added -proxy option to s_client

Slightly modified from [RT #2651]
Modifications for compilation on/for Windows

modified Makefiles to remove eay32 suffix of engine DLLs on Windows
added Windows specific extensions to .gitignore and Makefile.org
change build timestamp to universal timezone

(cherry picked from commit 2119bbf2fb878ee8bfe7778d5bedc39c0fac17e6)
Merge remote-tracking branch 'upstream/OpenSSL_1_0_2-stable' into 1.0.2-chacha
Fix to exclude parts compiling without ChaCha&Poly

Added several AEAD tests
Merge OpenSSL_1_0_2-stable into 1.0.2-chacha

Conflicts:
	crypto/sha/asm/sha512-x86_64.pl
Fix chacha20 poly1305 testcase
Merge branch 'OpenSSL_1_0_2-stable' of https://github.com/openssl/openssl into 1.0.2-chacha
Fix for SHA assembly code not compiling on Windows
Merge remote-tracking branch 'upstream/OpenSSL_1_0_2-stable' into 1.0.2-chacha
sha512-x86_64.pl: fix linking problem under Windows.
(cherry picked from commit 29be3f6411774e10169e60e1507df3d7c2e589df)
Fix possible buffer overrun.

(cherry picked from commit 2db3ea29298bdc347f15fbfab6d5746022f05101)

Conflicts:
	ssl/ssl_locl.h
	ssl/t1_lib.c