Turn on ntor by default client-side

Implements #8561.

diff --git a/changes/bug8561 b/changes/bug8561
new file mode 100644 (file)
index 0000000..598071a
--- /dev/null
+++ b/changes/bug8561
@@ -0,0 +1,3 @@
+  o Major features:
+    - The ntor handshake is now on-by-default, no matter what the
+      directory authorities recommend. Implements ticket 8561.

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index adcf6b7182ace593707b2d805441bf79bec11f9d..0a6f8f5245004452b63c39d98ee9f8c4239ef7b7 100644 (file)
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1253,9 +1253,9 @@ The following options are useful only for clients (that is, if
     it too early might make your client stand out. If this option is 0, your
     Tor client won't use the ntor handshake. If it's 1, your Tor client
     will use the ntor handshake to extend circuits through servers that
-    support it. If this option is "auto" (recommended), then your client
+    support it. If this option is "auto", then your client
     will use the ntor handshake once enough directory authorities recommend
-    it. (Default: auto)
+    it. (Default: 1)
 
 **PathBiasCircThreshold** __NUM__ +
 

diff --git a/src/or/config.c b/src/or/config.c
index cd9acf4f0606fb371676b8280ba99f1040321010..c57feaf270106c42580a83aabec48f34256f732d 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -404,7 +404,7 @@ static config_var_t option_vars_[] = {
   V(UseEntryGuards,              BOOL,     "1"),
   V(UseEntryGuardsAsDirGuards,   BOOL,     "1"),
   V(UseMicrodescriptors,         AUTOBOOL, "auto"),
-  V(UseNTorHandshake,            AUTOBOOL, "auto"),
+  V(UseNTorHandshake,            AUTOBOOL, "1"),
   V(User,                        STRING,   NULL),
   V(UserspaceIOCPBuffers,        BOOL,     "0"),
   VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir,   "0"),