Merge "build: Update wikimedia/ip-set from 2.0.1 to 2.1.0"

diff --combined composer.json
index 13c8993,982feb8..77dfc62
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -42,7 -42,7 +42,7 @@@
                "wikimedia/cldr-plural-rule-parser": "1.0.0",
                "wikimedia/composer-merge-plugin": "1.4.1",
                "wikimedia/html-formatter": "1.0.2",
-               "wikimedia/ip-set": "2.0.1",
+               "wikimedia/ip-set": "2.1.0",
                "wikimedia/less.php": "1.8.0",
                "wikimedia/object-factory": "2.1.0",
                "wikimedia/password-blacklist": "0.1.4",
@@@ -77,7 -77,7 +77,7 @@@
                "wikimedia/avro": "1.8.0",
                "wikimedia/testing-access-wrapper": "~1.0",
                "wmde/hamcrest-html-matchers": "^0.1.0",
 -              "mediawiki/mediawiki-phan-config": "0.6.1",
 +              "mediawiki/mediawiki-phan-config": "0.7.1",
                "symfony/yaml": "3.4.28",
                "johnkary/phpunit-speedtrap": "^1.0 | ^2.0"
        },