From ce450bddb7b66e73e34eec3844623884cbbcc27c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Feb 2014 11:10:55 -0500 Subject: Remove TunnelDirConns and PreferTunnelledDirConns These options were added back in 0.1.2.5-alpha, but no longer make any sense now that all directories support tunneled connections and BEGIN_DIR cells. These options were on by default; now they are always-on. This is a fix for 10849, where TunnelDirConns 0 would break hidden services -- and that bug arrived, I think, in 0.2.0.10-alpha. --- src/or/or.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/or/or.h') diff --git a/src/or/or.h b/src/or/or.h index b63b1ffcb..63b8e9c04 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3897,10 +3897,6 @@ typedef struct { * testing our DNS server. */ int EnforceDistinctSubnets; /**< If true, don't allow multiple routers in the * same network zone in the same circuit. */ - int TunnelDirConns; /**< If true, use BEGIN_DIR rather than BEGIN when - * possible. */ - int PreferTunneledDirConns; /**< If true, avoid dirservers that don't - * support BEGIN_DIR, when possible. */ int PortForwarding; /**< If true, use NAT-PMP or UPnP to automatically * forward the DirPort and ORPort on the NAT device */ char *PortForwardingHelper; /** < Filename or full path of the port @@ -4984,8 +4980,6 @@ typedef struct dir_server_t { * node that's currently a guard. */ #define PDS_FOR_GUARD (1<<5) -#define PDS_PREFER_TUNNELED_DIR_CONNS_ (1<<16) - /** Possible ways to weight routers when choosing one randomly. See * routerlist_sl_choose_by_bandwidth() for more information.*/ typedef enum bandwidth_weight_rule_t { -- cgit v1.2.3