tor-hsservice: Pass correct parameters to Establisher
And sort out some names and types to be correct, and correspond.
Assigning review to @nickm since I think he may have opinions, and in case there are going to be conflicts with other work he's doing.