Correctly formated my changes.
Added support for NoTLSv1_1 and NoTLSv1_2, and allowed options to be cleared.
Add SSL_get_cipher_name(...)
Merge branch 'master' of github.com:bramp/openssl