Merge branch 'master' into dev

# Conflicts:
#	adblock-for-dnsmasq.conf
#	anti-ad-domains.txt
#	anti-ad-easylist.txt
#	anti-ad-surge.txt

lib/black_domain_list.php

@@ -43,9 +43,6 @@ return array(
         'report.qq.com',
         'rcgi.video.qq.com',
     ),
-    'alibaba.com' => array(
-        'fourier.alibaba.com'
-    ),
     'openstorage.cn' => array(
         'iflyad.bjb.openstorage.cn'
     ),
@@ -149,12 +146,10 @@ return array(
     'xiaomi.com' => array(
         'data.mistat.intl.xiaomi.com',
         'data.mistat.xiaomi.com',
-        'o2o.api.xiaomi.com',
         'adv.sec.miui.com',
         'ad.intl.xiaomi.com',
         'ad.xiaomi.com',
         'admob.xiaomi.com',
-        'file.market.xiaomi.com',
     ),
     'zhihu.com' => array(
         'lc-push.zhihu.com',

lib/white_domain_list.php

@@ -46,6 +46,8 @@ return array(
     'bytedance.com' => 0, //字节跳动
     'tbskip.taobao.com' => 1, //淘宝订单搜索相关
     'wl.jd.com' => 0, //修复京东pc首页加载异常
+    'tanx.com' => 0, //饿了么店铺异常
+    'promotion.aliyun.com' => 0, //阿里云控制台
 
     'herokuapp.com' => 0,
     'vidoza.net' => 0,

self-closing.txt

@@ -4000,7 +4000,6 @@
 ||woolyss.com^
 ||woopie.jp^
 ||woopie.tv^
-||wordpress.com^
 ||workatruna.com^
 ||workerdemo.org.hk^
 ||workerempowerment.org^