diff options
| author | Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk> | 2011-08-18 18:42:02 +0100 |
|---|---|---|
| committer | Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk> | 2011-08-18 18:42:02 +0100 |
| commit | cc5b6d6cee607bbafbfd512986b2eea9c7c2c5ec (patch) | |
| tree | af5d4414ca9a278182151ad8f7401de109367d51 /src/or/connection.h | |
| parent | 7d015c886a3fc985ab767de01811d1591f0ac86a (diff) | |
| parent | 52e36feda153e70cd08d624df73035b7e59a95ef (diff) | |
| download | tor-cc5b6d6cee607bbafbfd512986b2eea9c7c2c5ec.tar.gz tor-cc5b6d6cee607bbafbfd512986b2eea9c7c2c5ec.zip | |
Merge remote branch 'origin/master' into bug2046
Diffstat (limited to 'src/or/connection.h')
| -rw-r--r-- | src/or/connection.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/connection.h b/src/or/connection.h index fedeba4b3a..d97729b446 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -22,6 +22,7 @@ dir_connection_t *dir_connection_new(int socket_family); or_connection_t *or_connection_new(int socket_family); edge_connection_t *edge_connection_new(int type, int socket_family); control_connection_t *control_connection_new(int socket_family); +listener_connection_t *listener_connection_new(int type, int socket_family); connection_t *connection_new(int type, int socket_family); void connection_link_connections(connection_t *conn_a, connection_t *conn_b); |