summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-04 09:56:46 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-04 09:56:46 -0500
commitce147d33f5c029fc74756dda8f9986cb4b8f2673 (patch)
tree2c969af08f43a9e96dadba4d7ab22c212ffc9e00 /src
parent07e06b335d8e044062818d2c5ae3e36a4834640f (diff)
downloadtor-ce147d33f5c029fc74756dda8f9986cb4b8f2673.tar.gz
tor-ce147d33f5c029fc74756dda8f9986cb4b8f2673.zip
Fix a wide line I introduced
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index cb27dac3c0..d7c1c5c435 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4892,8 +4892,8 @@ parse_transport_line(const or_options_t *options,
/* external */
/* ClientTransportPlugins connecting through a proxy is managed only. */
- if (!server &&
- (options->Socks4Proxy || options->Socks5Proxy || options->HTTPSProxy)) {
+ if (!server && (options->Socks4Proxy || options->Socks5Proxy ||
+ options->HTTPSProxy)) {
log_warn(LD_CONFIG, "You have configured an external proxy with another "
"proxy type. (Socks4Proxy|Socks5Proxy|HTTPSProxy)");
goto err;