Merge pull request #2981 from gmaxwell/tor2onion
Rename -tor to -onion to better reflect what it does.