Update greatfire (#2954)

* Add canva

* category-companies: include canva

data/2ch

@@ -1,2 +1,4 @@
 2ch.hk
 2ch.life
+2ch.org
+2ch.su

data/b3log

@@ -1,4 +1,5 @@
 # 云南链滴科技有限公司 滇ICP备14007358号
 b3log.org
 b3logfile.com
+hacpai.com
 ld246.com

data/canva

@@ -0,0 +1,7 @@
+# affinity
+affinity.api.serifservices.com
+affinity.studio
+affinity-beta.s3.amazonaws.com
+affinity-lessons.s3.amazonaws.com
+
+canva.com

data/category-companies

@@ -17,6 +17,7 @@ include:bandwagonhost
 include:blurams
 include:broadcom
 include:canon
+include:canva
 include:chegg
 include:cisco
 include:cloudcone

data/category-media-cn

@@ -12,6 +12,16 @@ include:weiphone
 include:xueqiu
 include:ynet
 
+# 江苏省广播电视总台
+jsbc.com
+jstv.com
+
+# 浙江广播电视集团/浙江卫视/新蓝网
+cztv.com
+cztvcdn.com
+cztvcloud.com
+zjstv.com
+
 # 数字尾巴
 dgtle.com
 
@@ -170,3 +180,6 @@ admin5.com
 
 # 江西省出版传媒集团
 jxpp.com
+
+# 人人都是产品经理
+woshipm.com

data/geolocation-cn

@@ -151,7 +151,7 @@ include:category-entertainment-cn
 include:category-game-accelerator-cn
 
 # Forums
-include:hacpai
+include:b3log
 include:kechuang
 include:nga
 include:stage1st
@@ -262,7 +262,6 @@ include:category-dev-cn
 include:aisiku # 北京艾斯酷科技有限公司
 include:akiko # 秋子酱科技
 include:alibaba
-include:b3log
 include:baidu
 include:beisen
 include:bluepoch
@@ -683,8 +682,6 @@ cwxzx.com
 cyagen.com
 cybtc.com
 cyts.com
-cztv.com
-cztvcloud.com
 dadajiasu.com
 dadighost.com
 daguzhe.com
@@ -923,9 +920,7 @@ jmstatic.com
 job5588.com
 job910.com
 jobjm.com
-jsbc.com
 jsrdgg.com
-jstv.com
 jsyks.com
 juefeng.com
 julive.com
@@ -1433,7 +1428,6 @@ zhugeio.com
 zimuzu.io
 zixiaomao.com
 zixuntop.com
-zjstv.com
 zmengzhu.com
 zongheng.com
 zpb365.com

data/greatfire

@@ -3,6 +3,8 @@ freebrowser.org
 freewechat.com
 freeweibo.com
 freezhihu.org
+googlecensorship.org
 greatfire.org
+greatfirevpn.com
 pao-pao.net
 wikiunblocked.org

data/hacpai

@@ -1,2 +0,0 @@
-hacpai.com
-ld246.com