Merge remote-tracking branch 'citadel/master' into tgsync

2021-01-08 00:33:57 -08:00
parent 16a9361345 76cb637f9d
commit ddad368d6a
231 changed files with 8727 additions and 6166 deletions
@@ -78,6 +78,7 @@
 	set_security_level("delta")
 	SSshuttle.registerHostileEnvironment(src)
 	SSshuttle.lockdown = TRUE
+	SSpersistence.station_was_destroyed = TRUE
 	sleep(600)
 	if(resolved == FALSE)
 		resolved = TRUE