Merge branch 'maint-0.4.3'

This commit is contained in:
Nick Mathewson
2020-05-06 16:47:03 -04:00
8 changed files with 33 additions and 5 deletions
+4 -1
View File
@@ -1071,7 +1071,10 @@ parse_socks_client(const uint8_t *data, size_t datalen,
log_info(LD_NET, "SOCKS 5 client: need authentication.");
*drain_out = -1;
return 2;
/* fall through */
default:
/* This wasn't supposed to be exhaustive; there are other
* authentication methods too. */
;
}
*reason = tor_strdup("server doesn't support any of our available "