Merge pull request #1148 from dunxen/2021-11-new-onion-errors