[tor-commits] [tor-browser-bundle/master] Convert remaining keys to keyrings. Add nick's key to the tor keyring. Remove unused obfsproxy keyring