[tor-commits] [torspec/master] socks-extensions.txt: Merge in prop304