diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-15 21:05:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-15 21:05:12 -0500 |
| commit | b56fd17d0003b0b66570a7d99aadbe901144f75d (patch) | |
| tree | 9945ff98d8a51e5f3db2bbc75847eda83166b9e7 /src/or/or.h | |
| parent | d9804691dfb507623d3c4bec56235ff7171ca17b (diff) | |
| parent | d662d4470a9030ad485dde1eb5426f063f9c3cf1 (diff) | |
| download | tor-b56fd17d0003b0b66570a7d99aadbe901144f75d.tar.gz tor-b56fd17d0003b0b66570a7d99aadbe901144f75d.zip | |
Merge branch 'maint-0.3.3'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h index f5a5f2579b..502cea0fe2 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1818,9 +1818,6 @@ typedef struct entry_connection_t { * the exit has sent a CONNECTED cell) and we have chosen to use it. */ unsigned int may_use_optimistic_data : 1; - - /** Are we a socks SocksSocket listener? */ - unsigned int is_socks_socket:1; } entry_connection_t; /** Subtype of connection_t for an "directory connection" -- that is, an HTTP @@ -3794,7 +3791,7 @@ typedef struct { * for control connections. */ int ControlSocketsGroupWritable; /**< Boolean: Are control sockets g+rw? */ - int SocksSocketsGroupWritable; /**< Boolean: Are SOCKS sockets g+rw? */ + int UnixSocksGroupWritable; /**< Boolean: Are SOCKS Unix sockets g+rw? */ /** Ports to listen on for directory connections. */ config_line_t *DirPort_lines; config_line_t *DNSPort_lines; /**< Ports to listen on for DNS requests. */ |