[tor-dev] Proposal: Merging Hidden Service Directories and Introduction Points