diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-21 09:40:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-21 09:40:16 -0400 |
| commit | 0e4c42a912d020888e811b748925362e1b3dc67b (patch) | |
| tree | 90a9e0e682a06bdf1af1ea9b0940dd81e20786e2 /src/core/or/connection_edge.h | |
| parent | a1b0283040723474377a5746dbd01782a9b7eaa7 (diff) | |
| parent | 03ef4ec466fd7f1de097a7b0244ca5bc8cc32b18 (diff) | |
| download | tor-0e4c42a912d020888e811b748925362e1b3dc67b.tar.gz tor-0e4c42a912d020888e811b748925362e1b3dc67b.zip | |
Merge remote-tracking branch 'ahf-github/asn/bugs4700_2'
Diffstat (limited to 'src/core/or/connection_edge.h')
| -rw-r--r-- | src/core/or/connection_edge.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/or/connection_edge.h b/src/core/or/connection_edge.h index 71ea95d6e5..6dee93f1f9 100644 --- a/src/core/or/connection_edge.h +++ b/src/core/or/connection_edge.h @@ -14,6 +14,8 @@ #include "lib/testsupport/testsupport.h" +#include "feature/hs/hs_service.h" + edge_connection_t *TO_EDGE_CONN(connection_t *); entry_connection_t *TO_ENTRY_CONN(connection_t *); entry_connection_t *EDGE_TO_ENTRY_CONN(edge_connection_t *); @@ -260,6 +262,10 @@ STATIC void connection_ap_handshake_rewrite(entry_connection_t *conn, rewrite_result_t *out); STATIC int connection_ap_process_http_connect(entry_connection_t *conn); +STATIC void +export_hs_client_circuit_id(edge_connection_t *edge_conn, + hs_circuit_id_protocol_t protocol); + #endif /* defined(CONNECTION_EDGE_PRIVATE) */ #endif /* !defined(TOR_CONNECTION_EDGE_H) */ |