Initial merge

src/util.h

@@ -64,6 +64,7 @@ inline std::string _(const char* psz)
 }
 
 void SetupEnvironment();
+bool SetupNetworking();
 
 /** Return true if log accepts specified category */
 bool LogAcceptCategory(const char* category);
@@ -136,10 +137,14 @@ void ReadConfigFile(std::map<std::string, std::string>& mapSettingsRet, std::map
 boost::filesystem::path GetSpecialFolderPath(int nFolder, bool fCreate = true);
 #endif
 boost::filesystem::path GetTempPath();
+void OpenDebugLog();
 void ShrinkDebugFile();
-void runCommand(std::string strCommand);
+void runCommand(const std::string& strCommand);
 const boost::filesystem::path GetExportDir();
 
+/** Returns privacy notice (for -version, -help and metrics screen) */
+std::string PrivacyInfo();
+
 /** Returns licensing information (for -version) */
 std::string LicenseInfo();