Merge pull request #2583 from Evanfeenstra/pub-make-onion