diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-15 11:44:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-15 11:44:51 -0400 |
| commit | 37e3fb8af20b02f764d0993218ed6025448073dd (patch) | |
| tree | 956927bb08f18e3f050cafdbc9c0c1f54a083d28 /src/or/circuituse.h | |
| parent | 2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e (diff) | |
| parent | f2871009346e0589455be14e9cef930c19082c0a (diff) | |
| download | tor-37e3fb8af20b02f764d0993218ed6025448073dd.tar.gz tor-37e3fb8af20b02f764d0993218ed6025448073dd.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/connection_edge.c
Diffstat (limited to 'src/or/circuituse.h')
| -rw-r--r-- | src/or/circuituse.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuituse.h b/src/or/circuituse.h index 1fdb191876..8e10212f16 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -50,5 +50,7 @@ int connection_ap_handshake_attach_chosen_circuit(edge_connection_t *conn, crypt_path_t *cpath); int connection_ap_handshake_attach_circuit(edge_connection_t *conn); +int hostname_in_track_host_exits(or_options_t *options, const char *address); + #endif |