diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-13 17:01:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-13 17:01:53 -0400 |
| commit | e5beb82e043cd14f69aace05d4d06784b0413802 (patch) | |
| tree | 8ba0057f70c5035547453abc351f0aac470cc02f /src/or | |
| parent | e3a6e01fe196fa1c1ae707065d515718795bc1d1 (diff) | |
| parent | f4fccee4d25b0de2780468b6f3b5b3b18d03945c (diff) | |
| download | tor-e5beb82e043cd14f69aace05d4d06784b0413802.tar.gz tor-e5beb82e043cd14f69aace05d4d06784b0413802.zip | |
Merge remote-tracking branch 'public/bug4663'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 9 |
1 files changed, 9 insertions, 0 deletions
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; |