diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-15 21:05:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-15 21:05:08 -0500 |
| commit | d662d4470a9030ad485dde1eb5426f063f9c3cf1 (patch) | |
| tree | 220bf6c94835d5cf788e515e7809340722213292 /src/or/or.h | |
| parent | 799c82be70edaf67ea9904e426cde5213b16f4b7 (diff) | |
| parent | 652d3a5b665f8045374eb527494dd9d80ef98d13 (diff) | |
| download | tor-d662d4470a9030ad485dde1eb5426f063f9c3cf1.tar.gz tor-d662d4470a9030ad485dde1eb5426f063f9c3cf1.zip | |
Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into 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 03efdd1d81..edf89be9a3 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. */ |