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/connection.h | |
| parent | 60832766ac19e8f027455d23254e376042c21ef2 (diff) | |
| parent | 6053e11ee6540750a68a7c59a1b91727f7e10952 (diff) | |
| download | tor-e006aa5dfa3110648daa92bde27e8abc87db3c57.tar tor-e006aa5dfa3110648daa92bde27e8abc87db3c57.tar.gz | |
Merge remote-tracking branch 'public/bug2841'
Conflicts:
src/or/config.c
Diffstat (limited to 'src/or/connection.h')
| -rw-r--r-- | src/or/connection.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/connection.h b/src/or/connection.h index 8dc011209..fedeba4b3 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -57,6 +57,9 @@ int connection_connect(connection_t *conn, const char *address, int connection_proxy_connect(connection_t *conn, int type); int connection_read_proxy_handshake(connection_t *conn); +void log_failed_proxy_connection(connection_t *conn); +int get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, + const connection_t *conn); int retry_all_listeners(smartlist_t *replaced_conns, smartlist_t *new_conns); |