summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-03-10 07:49:20 +0000
committerRoger Dingledine <arma@torproject.org>2008-03-10 07:49:20 +0000
commitd8651d1072adc4fb20e6bd0edcd5f9f06ec74a9a (patch)
tree76084f22de39e8bedd0a7d0b45de6f39d4fdc872
parent80ac7afb2ebb7e1233bc903ac8f510dc8cc4ad5f (diff)
downloadtor-d8651d1072adc4fb20e6bd0edcd5f9f06ec74a9a.tar.gz
tor-d8651d1072adc4fb20e6bd0edcd5f9f06ec74a9a.zip
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
-rw-r--r--ChangeLog6
-rw-r--r--src/or/config.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c62f037ac1..91f2d64eec 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 94197ec455..a7f127f20a 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"),