summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-29 14:45:21 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-29 14:46:20 -0500
commit204374f7d92997a510a7aabe5ec57f0f87a3499f (patch)
tree02c50353471c76167d4bc7c6c22af3407bdeaf22 /src/or/or.h
parentebc59092bc6badaa55743d85e6095c3e2d4993ff (diff)
downloadtor-204374f7d92997a510a7aabe5ec57f0f87a3499f.tar.gz
tor-204374f7d92997a510a7aabe5ec57f0f87a3499f.zip
Remove SocksSocket; it's now spelled differently thanks to 14451
Also, revise bug12585 changes file to mention new syntax
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 49068784f9..4207f3d7b3 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3463,9 +3463,6 @@ typedef struct {
* for control connections. */
int ControlSocketsGroupWritable; /**< Boolean: Are control sockets g+rw? */
- config_line_t *SocksSocket; /**< List of Unix Domain Sockets to listen on
- * for SOCKS connections. */
-
int SocksSocketsGroupWritable; /**< Boolean: Are SOCKS sockets g+rw? */
/** Ports to listen on for directory connections. */
config_line_t *DirPort_lines;
@@ -3489,7 +3486,6 @@ typedef struct {
*/
unsigned int ORPort_set : 1;
unsigned int SocksPort_set : 1;
- unsigned int SocksSocket_set : 1;
unsigned int TransPort_set : 1;
unsigned int NATDPort_set : 1;
unsigned int ControlPort_set : 1;