Finished version
Merge branch '3.6' of https://github.com/opalkale/tls-project into 3.6

Conflicts:
	client.c