From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 4 Nov 2014 14:56:46 +0000 (-0500)
Subject: Fix a wide line I introduced
X-Git-Tag: tor-0.2.6.2-alpha~110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce147d33f5c029fc74756dda8f9986cb4b8f2673;p=thirdparty%2Ftor.git

Fix a wide line I introduced
---

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;