diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-11 12:10:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-11 12:10:14 -0500 |
| commit | f729e1e984896a9d6852768a8e5528932f668ac3 (patch) | |
| tree | f6e1aa68ec9e5f6875a06224333b96b8f7938b2e /src/or/circuituse.h | |
| parent | f37181620951d2e7a13f1363386563115d628761 (diff) | |
| parent | b5af456685b502462385b5f1b7f22f4374822fe1 (diff) | |
| download | tor-f729e1e984896a9d6852768a8e5528932f668ac3.tar tor-f729e1e984896a9d6852768a8e5528932f668ac3.tar.gz | |
Merge branch 'feature3457-v4-nm-squashed'
Conflicts:
src/or/rendclient.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 bc11fe5d9..78948b5f9 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -51,6 +51,8 @@ int connection_ap_handshake_attach_chosen_circuit(entry_connection_t *conn, crypt_path_t *cpath); int connection_ap_handshake_attach_circuit(entry_connection_t *conn); +void circuit_change_purpose(circuit_t *circ, uint8_t new_purpose); + int hostname_in_track_host_exits(const or_options_t *options, const char *address); |