Merge remote-tracking branch 'teor/reject-tap-v6'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/circuitlist.c
Simple merge

diff --cc src/or/config.c
index 31bf81877de0f12d6e37379882cbe051a1449769,7478e603dc1a535cb6a864656dad7d08a0474f7e..6ab2fd81161193c3b4ef2c79c3a2a491deeaac61
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -438,9 -438,9 +438,9 @@@ static config_var_t option_vars_[] = 
    V(UseEntryGuardsAsDirGuards,   BOOL,     "1"),
    V(UseGuardFraction,            AUTOBOOL, "auto"),
    V(UseMicrodescriptors,         AUTOBOOL, "auto"),
-   V(UseNTorHandshake,            AUTOBOOL, "1"),
+   OBSOLETE("UseNTorHandshake"),
    V(User,                        STRING,   NULL),
 -  V(UserspaceIOCPBuffers,        BOOL,     "0"),
 +  OBSOLETE("UserspaceIOCPBuffers"),
    V(AuthDirSharedRandomness,     BOOL,     "1"),
    OBSOLETE("V1AuthoritativeDirectory"),
    OBSOLETE("V2AuthoritativeDirectory"),

diff --cc src/or/networkstatus.c
Simple merge

diff --cc src/or/nodelist.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/rendclient.c
Simple merge

diff --cc src/or/rendservice.c
Simple merge

diff --cc src/or/router.c
Simple merge

diff --cc src/or/routerlist.c
index 1773f1d05c76a0c547327243d9868f8e8b83662a,08015038fa7efe86e4d1b9a62bba15da322f3e1a..74b8d1b1d33808f3a30a0bbf62cae26bf64d0c9b
--- 1/src/or/routerlist.c
--- 2/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2260,10 -2260,15 +2260,16 @@@ router_add_running_nodes_to_smartlist(s
        continue;
      if (node_is_unreliable(node, need_uptime, need_capacity, need_guard))
        continue;
-     /* Choose a node with an OR address that matches the firewall rules,
-      * if we are making a direct connection */
+     /* Don't choose nodes if we are certain they can't do ntor */
+     if (node->rs && !routerstatus_version_supports_ntor(node->rs, 1))
+       continue;
+     if ((node->ri || node->md) && !node_has_curve25519_onion_key(node))
+       continue;
+     /* Choose a node with an OR address that matches the firewall rules */
 -    if (check_reach && !fascist_firewall_allows_node(node,
 -                                                     FIREWALL_OR_CONNECTION,
 -                                                     pref_addr))
 +    if (direct_conn && check_reach &&
-         !fascist_firewall_allows_node(node, FIREWALL_OR_CONNECTION, pref_addr))
++        !fascist_firewall_allows_node(node,
++                                      FIREWALL_OR_CONNECTION,
++                                      pref_addr))
        continue;
  
      smartlist_add(sl, (void *)node);

diff --cc src/or/routerlist.h
Simple merge

diff --cc src/test/test_dir.c
Simple merge