Merge pull request #2677 from Evanfeenstra/public-onion-utils