diff options
| -rw-r--r-- | changes/bug4663 | 5 | ||||
| -rw-r--r-- | src/or/config.c | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug4663 b/changes/bug4663 new file mode 100644 index 0000000000..f720ff5da4 --- /dev/null +++ b/changes/bug4663 @@ -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. diff --git a/src/or/config.c b/src/or/config.c index 09fcf000be..782a6e9248 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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; |