commit ce147d33f5c029fc74756dda8f9986cb4b8f2673 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 4 09:56:46 2014 -0500

Fix a wide line I introduced --- src/or/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c index cb27dac..d7c1c5c 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;