aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/or/config.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c57fe9567..bf8fe7572 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@ Changes in version 0.1.2.5-xxxx - 200?-??-??
o Major features:
- Enable "BEGIN_DIR" cells: prefer to connect to the directory
server via TLS so we do encrypted directory requests rather than
- plaintext. Only used if you enable the TunnelDirConns config option.
+ plaintext. On by default; disable via the TunnelDirConns config
+ option if you like.
o Minor features:
- Start using the state file to store bandwidth accounting data:
diff --git a/src/or/config.c b/src/or/config.c
index b39e187dc..27665ac46 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -247,7 +247,7 @@ static config_var_t _option_vars[] = {
OBSOLETE("TrafficShaping"),
VAR("TransListenAddress", LINELIST, TransListenAddress, NULL),
VAR("TransPort", UINT, TransPort, "0"),
- VAR("TunnelDirConns", BOOL, TunnelDirConns, "0"),
+ VAR("TunnelDirConns", BOOL, TunnelDirConns, "1"),
VAR("UseEntryGuards", BOOL, UseEntryGuards, "1"),
VAR("User", STRING, User, NULL),
VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"),