diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:49:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:49:49 -0400 |
| commit | da7c60dcf310fb9914bfd1b84a34b440ab04900a (patch) | |
| tree | 1a30bd8ef9e3473a45a5c72c538afceae9233412 /src/or/or.h | |
| parent | 6802499413f8efd98ad4d578e5ef937cb55c1edc (diff) | |
| parent | cfeafe5e77c9dd5587b1ec553eb1065f0bf841fd (diff) | |
| download | tor-da7c60dcf310fb9914bfd1b84a34b440ab04900a.tar.gz tor-da7c60dcf310fb9914bfd1b84a34b440ab04900a.zip | |
Merge remote-tracking branch 'public/bug3270' into maint-0.2.2
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 6ccd95727c..97fecd1500 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -970,7 +970,7 @@ typedef struct connection_t { unsigned int proxy_state:4; /** Our socket; -1 if this connection is closed, or has no socket. */ - evutil_socket_t s; + tor_socket_t s; int conn_array_index; /**< Index into the global connection array. */ struct event *read_event; /**< Libevent event structure. */ struct event *write_event; /**< Libevent event structure. */ |