Merge prop304 (onion-service socks errors) into socks-extensions.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information