Merge branch 'master' into jgrpp

# Conflicts:
#	src/console_cmds.cpp
#	src/network/core/config.h
#	src/network/core/packet.h
#	src/network/core/tcp.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_gui.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/table/settings/network_secrets_settings.ini

src/table/settings/network_secrets_settings.ini

@@ -75,6 +75,24 @@ def      = nullptr
 pre_cb   = ReplaceAsteriskWithEmptyPassword
 cat      = SC_EXPERT
 
+[SDTC_SSTR]
+var      = network.client_secret_key
+type     = SLE_STR
+length   = NETWORK_SECRET_KEY_LENGTH
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = nullptr
+; Prevent the user from setting the secret key from the console using 'setting'
+pre_cb   = [](auto) { return false; }
+
+[SDTC_SSTR]
+var      = network.client_public_key
+type     = SLE_STR
+length   = NETWORK_SECRET_KEY_LENGTH
+flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
+def      = nullptr
+; Prevent the user from setting the public key from the console using 'setting'
+pre_cb   = [](auto) { return false; }
+
 [SDTC_SSTR]
 var      = network.default_company_pass
 type     = SLE_STR