Enable encrypted directory connections by default, so censor

tools that block Tor directory connections based on their plaintext
patterns will no longer work. This means Tor works in certain
censored countries by default again.


svn:r13934

ChangeLog

@@ -1,4 +1,10 @@
 Changes in version 0.2.0.22-rc - 2008-03-??
+  o Major features:
+    - Enable encrypted directory connections by default, so censor
+      tools that block Tor directory connections based on their plaintext
+      patterns will no longer work. This means Tor works in certain
+      censored countries by default again.
+
   o Minor bugfixes:
     - If we set RelayBandwidthRate and RelayBandwidthBurst very high but
       left BandwidthRate and BandwidthBurst at the default, we would be

src/or/config.c

@@ -243,7 +243,7 @@ static config_var_t _option_vars[] = {
   V(OutboundBindAddress,         STRING,   NULL),
   OBSOLETE("PathlenCoinWeight"),
   V(PidFile,                     STRING,   NULL),
-  V(PreferTunneledDirConns,      BOOL,     "0"),
+  V(PreferTunneledDirConns,      BOOL,     "1"),
   V(ProtocolWarnings,            BOOL,     "0"),
   V(PublishServerDescriptor,     CSV,      "1"),
   V(PublishHidServDescriptors,   BOOL,     "1"),
@@ -289,7 +289,7 @@ static config_var_t _option_vars[] = {
   OBSOLETE("TrafficShaping"),
   V(TransListenAddress,          LINELIST, NULL),
   V(TransPort,                   UINT,     "0"),
-  V(TunnelDirConns,              BOOL,     "0"),
+  V(TunnelDirConns,              BOOL,     "1"),
   V(UpdateBridgesFromAuthority,  BOOL,     "0"),
   V(UseBridges,                  BOOL,     "0"),
   V(UseEntryGuards,              BOOL,     "1"),