From d8651d1072adc4fb20e6bd0edcd5f9f06ec74a9a Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 10 Mar 2008 07:49:20 +0000 Subject: [PATCH] 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 | 6 ++++++ src/or/config.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c62f037ac..91f2d64ee 100644 --- a/ChangeLog +++ b/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 diff --git a/src/or/config.c b/src/or/config.c index 94197ec45..a7f127f20 100644 --- a/src/or/config.c +++ b/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"),