Merge pull request #1042 from gavinandresen/use_ssl_cleanup