Merge branch 'typo-socks-proxy' into 'main'

Fix a typo in the HTTP proxy error message.

See merge request tpo/core/tor!829
This commit is contained in:
David Goulet 2024-09-10 12:49:51 +00:00
commit a56350abc8

View File

@ -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" "<title>This is a SOCKS Proxy, Not An HTTP Proxy</title>\n"
"</head>\n" "</head>\n"
"<body>\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" "<p>\n"
"It appears you have configured your web browser to use this Tor port as\n" "It appears you have configured your web browser to use this Tor port as\n"
"an HTTP proxy.\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" "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" "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" "configuration option in place of, or in addition to, SOCKSPort.\n"