commit a56350abc8a8c18bfe0b60c751cce5f851db0d3e
parent f909c86fc0f691cf3884507bbaecdf0aa7af68ad
Author: David Goulet <dgoulet@torproject.org>
Date: Tue, 10 Sep 2024 12:49:51 +0000
Merge branch 'typo-socks-proxy' into 'main'
Fix a typo in the HTTP proxy error message.
See merge request tpo/core/tor!829
Diffstat:
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c
@@ -932,11 +932,12 @@ static const char SOCKS_PROXY_IS_NOT_AN_HTTP_PROXY_MSG[] =
"<title>This is a SOCKS Proxy, Not An HTTP Proxy</title>\n"
"</head>\n"
"<body>\n"
- "<h1>This is a SOCKs proxy, not an HTTP proxy.</h1>\n"
+ "<h1>This is a SOCKS proxy, not an HTTP proxy.</h1>\n"
"<p>\n"
"It appears you have configured your web browser to use this Tor port as\n"
"an HTTP proxy.\n"
- "</p><p>\n"
+ "</p>\n"
+ "<p>\n"
"This is not correct: This port is configured as a SOCKS proxy, not\n"
"an HTTP proxy. If you need an HTTP proxy tunnel, use the HTTPTunnelPort\n"
"configuration option in place of, or in addition to, SOCKSPort.\n"
