removed Tor addresses

src/net.cpp

@@ -23,7 +23,6 @@
 #include <miniupnpc/upnperrors.h>
 #endif
 
-#define TOR_NET_STRING "tor"
 
 // Dump addresses to peers.dat every 15 minutes (900s)
 #define DUMP_ADDRESSES_INTERVAL 900
@@ -129,22 +128,11 @@ bool IsDarknetOnly()
 {
     if (IsI2POnly())
 	return true;
-    if (IsTorOnly())
+    if ((mapArgs.count("-proxy") && mapArgs["-proxy"] != "0") && (mapArgs.count("-i2p") && mapArgs["-i2p"] != "0"))
-	return true;
-    if (((mapArgs.count("-proxy") && mapArgs["-proxy"] != "0") || (mapArgs.count("-tor") &&
-	mapArgs["-tor"] != "0")) && (mapArgs.count("-i2p") && mapArgs["-i2p"] != "0"))
 	return true;
     return false;
 }
 
-bool IsTorOnly()
-{
-    bool i2pOnly = false;
-    const std::vector<std::string>& onlyNets = mapMultiArgs["-onlynet"];
-    i2pOnly = (onlyNets.size() == 1 && onlyNets[0] == TOR_NET_STRING);
-    return i2pOnly;
-}
-
 bool IsI2POnly()
 {
     bool i2pOnly = false;
@@ -172,12 +160,8 @@ bool IsBehindDarknet()
 {
     if (IsI2POnly())
         return true;
-    if (IsTorOnly())
-        return true;
     if (IsDarknetOnly())
         return true;
-    if ((mapArgs.count("-tor") && mapArgs["-tor"] != "0"))
-        return true;
     return false;
 }
 

src/net.h

@@ -50,7 +50,6 @@ bool BindListenNativeI2P(SOCKET& hSocket);
 bool IsI2POnly();
 bool IsI2PEnabled();
 
-bool IsTorOnly();
 bool IsDarknetOnly();
 bool IsBehindDarknet();
 

src/qt/bitcoingui.cpp

@@ -347,11 +347,6 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
             labelI2POnly->setText("I2P");
             labelI2POnly->setToolTip(tr("Wallet is using I2P-network only"));
         }
-	else if (clientModel->isTorOnly())
-	{
-	    labelI2POnly->setText("Tor");
-	    labelI2POnly->setToolTip(tr("Wallet is using Tor-network only"));
-	}
 	else if (clientModel->isDarknetOnly())
 	{
 	    labelI2POnly->setText("I&T");

src/qt/clientmodel.cpp

@@ -149,10 +149,6 @@ bool ClientModel::isI2POnly() const
     return IsI2POnly();
 }
 
-bool ClientModel::isTorOnly() const
-{
-    return IsTorOnly();
-}
 
 bool ClientModel::isDarknetOnly() const
 {