Merge branch 'master' into upstream-merge-31069

This commit is contained in:
LetterJay
2017-10-01 02:56:28 -04:00
committed by GitHub
304 changed files with 74912 additions and 8305 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
if(B.blob_core || !B.placed)
return 0
if(!GLOB.blob_cores.len) //blob is dead
if(config.continuous["blob"])
if(CONFIG_GET(keyed_flag_list/continuous)["blob"])
message_sent = FALSE //disable the win count at this point
continuous_sanity_checked = 1 //Nonstandard definition of "alive" gets past the check otherwise
SSshuttle.clearHostileEnvironment(src)