diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-15 14:14:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-15 14:14:13 -0500 |
| commit | 8c2affe637e0cfbf5ddfe02c910c75bcd749ded3 (patch) | |
| tree | 84c6140c4b32bbd7ef4b226c59329c8345ccde24 /src/or/directory.c | |
| parent | 3d7772ece3128097f4d541585e525c61f6ea27c2 (diff) | |
| parent | ac2c0cb587548c4faf3fa225064cdbd183f609bb (diff) | |
| download | tor-8c2affe637e0cfbf5ddfe02c910c75bcd749ded3.tar.gz tor-8c2affe637e0cfbf5ddfe02c910c75bcd749ded3.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
src/or/cpuworker.c
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index a4d123d64e..8dece8629a 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -860,7 +860,7 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, /* ensure that we don't make direct connections when a SOCKS server is * configured. */ - if (!anonymized_connection && !use_begindir && !options->HttpProxy && + if (!anonymized_connection && !use_begindir && !options->HTTPProxy && (options->Socks4Proxy || options->Socks5Proxy)) { log_warn(LD_DIR, "Cannot connect to a directory server through a " "SOCKS proxy!"); @@ -891,9 +891,9 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, if (!anonymized_connection && !use_begindir) { /* then we want to connect to dirport directly */ - if (options->HttpProxy) { - tor_addr_copy(&addr, &options->HttpProxyAddr); - dir_port = options->HttpProxyPort; + if (options->HTTPProxy) { + tor_addr_copy(&addr, &options->HTTPProxyAddr); + dir_port = options->HTTPProxyPort; } switch (connection_connect(TO_CONN(conn), conn->_base.address, &addr, @@ -1084,9 +1084,9 @@ directory_send_command(dir_connection_t *conn, } /* come up with some proxy lines, if we're using one. */ - if (direct && get_options()->HttpProxy) { + if (direct && get_options()->HTTPProxy) { char *base64_authenticator=NULL; - const char *authenticator = get_options()->HttpProxyAuthenticator; + const char *authenticator = get_options()->HTTPProxyAuthenticator; tor_snprintf(proxystring, sizeof(proxystring),"http://%s", hoststring); if (authenticator) { |