Merge #8715: net: only delete CConnman if it's been created

36fa01f net: only delete CConnman if it's been created (Cory Fields)

Author: laanwj

src/init.cpp

@@ -200,7 +200,6 @@ void Shutdown()
         pwalletMain->Flush(false);
 #endif
     MapPort(false);
-    g_connman->Stop();
     g_connman.reset();
 
     StopTorControl();

src/net.cpp

@@ -2205,6 +2205,7 @@ void CConnman::DeleteNode(CNode* pnode)
 
 CConnman::~CConnman()
 {
+    Stop();
 }
 
 size_t CConnman::GetAddressCount() const