[tor-commits] [ooni-probe/master] Move general SOCKSError after more specific failures