Merge pull request #163 from esainane/fix-ssl-identd-race