aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-10-29 19:41:24 +0200
committerSebastian Hahn <sebastian@torproject.org>2010-11-10 15:48:26 +0100
commitb9cac605abf029d9f0eb3d83a5f64f5b484d61c1 (patch)
tree55acc332c2ca5360f5d531f5f97aee5b5c5b6821 /src/or/connection_or.c
parent13a7e8bea3b9d37b1bfd5e3a3ea14dd650be632e (diff)
downloadtor-b9cac605abf029d9f0eb3d83a5f64f5b484d61c1.tar
tor-b9cac605abf029d9f0eb3d83a5f64f5b484d61c1.tar.gz
Synx manpage and source wrt option capitalization
We had a spelling discrepancy between the manpage and the source code for some option. Resolve these in favor of the manpage, because it makes more sense (for example, HTTP should be capitalized).
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 052da6763..415a48dca 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -308,7 +308,7 @@ connection_or_finished_connecting(or_connection_t *or_conn)
proxy_type = PROXY_NONE;
- if (get_options()->HttpsProxy)
+ if (get_options()->HTTPSProxy)
proxy_type = PROXY_CONNECT;
else if (get_options()->Socks4Proxy)
proxy_type = PROXY_SOCKS4;
@@ -805,10 +805,10 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port,
control_event_or_conn_status(conn, OR_CONN_EVENT_LAUNCHED, 0);
/* use a proxy server if available */
- if (options->HttpsProxy) {
+ if (options->HTTPSProxy) {
using_proxy = 1;
- tor_addr_copy(&addr, &options->HttpsProxyAddr);
- port = options->HttpsProxyPort;
+ tor_addr_copy(&addr, &options->HTTPSProxyAddr);
+ port = options->HTTPSProxyPort;
} else if (options->Socks4Proxy) {
using_proxy = 1;
tor_addr_copy(&addr, &options->Socks4ProxyAddr);