Merge branch 'ml/http'

* ml/http:
http.c: add http.sslCertPasswordProtected option
http.c: prompt for SSL client certificate password

Conflicts:
http.c