Refactor legacy code to support hs_ident along with rend_data.

The legacy HS circuit code uses rend_data to match between circuits and
streams. We refactor some of that code so that it understands hs_ident
as well which is used for prop224.