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/connection.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/connection.c')
| -rw-r--r-- | src/or/connection.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 52996e8ea4..14883157a9 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -623,7 +623,7 @@ connection_about_to_close_connection(connection_t *conn) or_options_t *options = get_options(); rep_hist_note_connect_failed(or_conn->identity_digest, now); entry_guard_register_connect_status(or_conn->identity_digest,0, - !options->HttpsProxy, now); + !options->HTTPSProxy, now); if (conn->state >= OR_CONN_STATE_TLS_HANDSHAKING) { int reason = tls_error_to_orconn_end_reason(or_conn->tls_error); control_event_or_conn_status(or_conn, OR_CONN_EVENT_FAILED, @@ -1413,7 +1413,7 @@ connection_proxy_connect(connection_t *conn, int type) case PROXY_CONNECT: { char buf[1024]; char *base64_authenticator=NULL; - const char *authenticator = options->HttpsProxyAuthenticator; + const char *authenticator = options->HTTPSProxyAuthenticator; /* Send HTTP CONNECT and authentication (if available) in * one request */ @@ -1918,8 +1918,8 @@ retry_all_listeners(smartlist_t *replaced_conns, replaced_conns, new_conns, 0, AF_INET)<0) return -1; - if (retry_listeners(CONN_TYPE_AP_NATD_LISTENER, options->NatdListenAddress, - options->NatdPort, "127.0.0.1", + if (retry_listeners(CONN_TYPE_AP_NATD_LISTENER, options->NATDListenAddress, + options->NATDPort, "127.0.0.1", replaced_conns, new_conns, 0, AF_INET)<0) return -1; |