diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-13 01:36:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-13 01:36:31 -0400 |
| commit | 286f407cd2ffbbbc41736fe4054faf870a1d96aa (patch) | |
| tree | 348fa1324c12a88cb901a149c25862a1c493a3ad /src/or/connection_edge.h | |
| parent | f906e4ab39a365ca6a64e3346719e92ed2065afd (diff) | |
| parent | 22285aa964fd447f5537fa3e0a296a2b6ee405f9 (diff) | |
| download | tor-286f407cd2ffbbbc41736fe4054faf870a1d96aa.tar.gz tor-286f407cd2ffbbbc41736fe4054faf870a1d96aa.zip | |
Merge remote branch 'sebastian/bug1525'
Diffstat (limited to 'src/or/connection_edge.h')
| -rw-r--r-- | src/or/connection_edge.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index d1bce48e8f..762af5172e 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -79,6 +79,9 @@ void client_dns_set_addressmap(const char *address, uint32_t val, const char *addressmap_register_virtual_address(int type, char *new_address); void addressmap_get_mappings(smartlist_t *sl, time_t min_expires, time_t max_expires, int want_expiry); +int connection_ap_rewrite_and_attach_if_allowed(edge_connection_t *conn, + origin_circuit_t *circ, + crypt_path_t *cpath); int connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn, origin_circuit_t *circ, crypt_path_t *cpath); |