disable v2-only blanket on tor/i2p/cjdns

Author: stratospher

src/init.cpp

@@ -1377,6 +1377,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                   "-cjdnsreachable is not provided"));
         }
         g_reachable_nets.Remove(NET_CJDNS);
+    } else {
+        g_v2_only = false;
     }
     // Now g_reachable_nets.Contains(NET_CJDNS) is true if:
     // 1. -cjdnsreachable is given and
@@ -1452,6 +1454,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     if (onion_proxy.IsValid()) {
         SetProxy(NET_ONION, onion_proxy);
+        g_v2_only = false;
     } else {
         // If -listenonion is set, then we will (try to) connect to the Tor control port
         // later from the torcontrol thread and may retrieve the onion proxy from there.
@@ -1948,6 +1951,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
             return InitError(strprintf(_("Invalid -i2psam address or hostname: '%s'"), i2psam_arg));
         }
         SetProxy(NET_I2P, Proxy{addr.value()});
+        g_v2_only = false;
     } else {
         if (args.IsArgSet("-onlynet") && g_reachable_nets.Contains(NET_I2P)) {
             return InitError(