Merge branch 'master' into responseintercept

# Conflicts:
#	packages/core/src/config/index.js

packages/core/src/config/index.js

@@ -20,6 +20,12 @@ module.exports = {
         '/.*/.*/blame/': {
           redirect: 'hub.fastgit.org'
         },
+        '/.*': {
+          proxy: 'github.com',
+          backup: [
+            'github.docmirror.cn'
+          ]
+        },
         '/.*/[^\\/]*$': {
           script: 'console.log("123123132")'
         }
@@ -27,7 +33,7 @@ module.exports = {
       'raw.githubusercontent.com': {
         '.*': { proxy: 'raw.fastgit.org' }
       },
-      'github11.githubassets.com': {
+      'github.githubassets.com': {
         '.*': { proxy: 'assets.fastgit.org', test: 'https://github.githubassets.com/favicons/favicon.svg' }
       },
       'customer-stories-feed.github.com': {
@@ -82,7 +88,13 @@ module.exports = {
       'archive.cloudera.com': { '.*': { regexp: '/cdh5/.*', proxy: 'cloudera.proxy.ustclug.org' } },
       'downloads.lede-project.org': { '.*': { proxy: 'lede.proxy.ustclug.org' } },
       'downloads.openwrt.org': { '.*': { proxy: 'openwrt.proxy.ustclug.org' } },
-      'secure.gravatar.com': { '.*': { proxy: 'gravatar.proxy.ustclug.org' } }
+      'secure.gravatar.com': { '.*': { proxy: 'gravatar.proxy.ustclug.org' } },
+      '*.carbonads.com': {
+        '/carbon.*': {
+          abort: true,
+          desc: '广告拦截'
+        }
+      }
     },
     whiteList: {
       'alipay.com': true,
@@ -109,7 +121,8 @@ module.exports = {
         '*.githubusercontent.com': 'usa',
         '*.githubassets.com': 'usa',
         // "解决push的时候需要输入密码的问题",
-        'github.com': 'usa'
+        'github.com': 'usa',
+        '*.vuepress.vuejs.org': 'usa'
       }
     }
   },