Rethink "client key bundle" logic.
We no longer have multiple kinds of client authentication/authorication key in tor-hsclient; maybe having a "bundle" of these keys is not such a great idea any more?
We'll want to make sure, though, that we do this in a forward-compatible way if we do add other key types in the future.