Merge remote-tracking branch 'public/bug10849_025'

Conflicts:
	src/or/config.c

1 files changed, 0 insertions, 6 deletions

diff --git a/src/or/or.h b/src/or/or.h
index aeaeb8e6a9..6aa6b59e8e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3886,10 +3886,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
@@ -4974,8 +4970,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 {