diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-11 15:57:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-11 15:57:12 -0400 |
| commit | e006aa5dfa3110648daa92bde27e8abc87db3c57 (patch) | |
| tree | 879060e81792239f09848da241eb131397a40907 /src/or/main.c | |
| parent | 60832766ac19e8f027455d23254e376042c21ef2 (diff) | |
| parent | 6053e11ee6540750a68a7c59a1b91727f7e10952 (diff) | |
| download | tor-e006aa5dfa3110648daa92bde27e8abc87db3c57.tar.gz tor-e006aa5dfa3110648daa92bde27e8abc87db3c57.zip | |
Merge remote-tracking branch 'public/bug2841'
Conflicts:
src/or/config.c
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 9536ae4490..1baefc71bd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -757,6 +757,13 @@ conn_close_if_marked(int i) #endif log_debug(LD_NET,"Cleaning up connection (fd %d).",conn->s); + + /* If the connection we are about to close was trying to connect to + a proxy server and failed, the client won't be able to use that + proxy. We should warn the user about this. */ + if (conn->proxy_state == PROXY_INFANT) + log_failed_proxy_connection(conn); + IF_HAS_BUFFEREVENT(conn, goto unlink); if ((SOCKET_OK(conn->s) || conn->linked_conn) && connection_wants_to_flush(conn)) { |