mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge remote-tracking branch 'public/bug4663'
This commit is contained in:
commit
e5beb82e04
5
changes/bug4663
Normal file
5
changes/bug4663
Normal file
@ -0,0 +1,5 @@
|
||||
o Minor features:
|
||||
- Warn the user when HTTPProxy, but no other proxy type, is
|
||||
configured. This can cause surprising behavior: it doesn't send
|
||||
all of Tor's traffic over the HTTPProxy--it sends unencrypted
|
||||
directory traffic only. Resolves ticket 4663.
|
@ -3889,6 +3889,15 @@ options_validate(or_options_t *old_options, or_options_t *options,
|
||||
REJECT("You have configured more than one proxy type. "
|
||||
"(Socks4Proxy|Socks5Proxy|HTTPSProxy|ClientTransportPlugin)");
|
||||
|
||||
/* Check if the proxies will give surprising behavior. */
|
||||
if (options->HTTPProxy && !(options->Socks4Proxy ||
|
||||
options->Socks5Proxy ||
|
||||
options->HTTPSProxy)) {
|
||||
log_warn(LD_CONFIG, "HTTPProxy configured, but no SOCKS proxy or "
|
||||
"HTTPS proxy configured. Watch out: this configuration will "
|
||||
"proxy unencrypted directory connections only.");
|
||||
}
|
||||
|
||||
if (options->Socks5ProxyUsername) {
|
||||
size_t len;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user