Implement the needs of @AnonSphere and the stuff he did not request yet and fix #1115
Merge pull request #1117 from cherokee/more_tls_options

Implement the needs of @AnonSphere and the stuff he did not request yet