Merge remote-tracking branch 'upstream/master'

Discovery/JavaScript Miners

@@ -0,0 +1,24 @@
+  "*://*.edgeno.de/*",
+  "*://*.lmodr.biz/*",
+  "*://*.listat.biz/*",
+  "*://*.2giga.link/js*",
+  "*://*.reasedoper.pw/*",
+  "*://*.jyhfuqoh.info/*",
+  "*://*.mataharirama.xyz/*",
+  "*://*.minecrunch.co/web/*",
+  "*://*.jsecoin.com/lib/*",
+  "*://*.jsecoin.com/proxy/*",
+  "*://*.jsecoin.com/server/*",
+  "*://*.jsecoin.com/captcha/*",
+  "*://*.coin-hive.com/lib/*",
+  "*://*.coin-hive.com/proxy/*",
+  "*://*.coin-hive.com/server/*",
+  "*://*.coin-hive.com/captcha/*",
+  "*://*.coinhive.com/lib/*",
+  "*://*.coinhive.com/proxy/*",
+  "*://*.coinhive.com/server/*",
+  "*://*.coinhive.com/captcha/*",
+  "*://*.minemytraffic.com/lib/*",
+  "*://*.minemytraffic.com/proxy/*",
+  "*://*.minemytraffic.com/server/*",
+  "*://*.minemytraffic.com/captcha/*"

Discovery/Web-Content/Common-PHP-Filenames.txt

@@ -1,5 +1,6 @@
 default.php
 index.php
+invocactf.php
 view.html.php
 helper.php
 controller.php

Discovery/Web-Content/Logins.fuzz.txt

@@ -29,6 +29,7 @@
 /login.php
 /login.php3
 /login.php4
+/login.jsp
 /login.pl
 /login.py
 /login.rb
@@ -44,3 +45,4 @@
 /typo3/in
 /utilities/TreeView.asp
 /webeditor.php
+/invocactf.php