Merge branch 'master' of github.com:EFForg/https-everywhere

Author: zoracon

.editorconfig

@@ -1,4 +1,4 @@
-# EditorConfig is awesome: http://EditorConfig.org
+# EditorConfig is awesome: https://EditorConfig.org
 
 root = true
 

.github/pull_request_template.md

@@ -0,0 +1,26 @@
+***Delete section if irrelevant***
+
+### List related PRs if any
+
+- pr link
+
+### List related issues if any
+
+- issue link
+
+***May delete note after reading***
+
+### Note to contributor:
+Thank you for contributing! If this is a new ruleset and your first time contributing, congratulations! There will be some tests ran through our continuous integration in Travis. For example, checking for duplicate hosts, problematic hosts, etc. in the ruleset file. You will see this testing begin when you open this pull request.
+
+If this is not your first time and you have open PRs that have not been closed or merged, please revisit them by searching: `https://github.com/EFForg/https-everywhere/issues?q=is%3Aopen+assignee%3A[yourusernamehere]`. If there is something not being addressed by other maintainers or a project lead, link them to the PR with your question. Thank you for your patience.
+
+More helpful filters in Pull Request search:
+- Changes requested: 
+`is:pr is:open type:pr review:changes_requested author:[your username]`
+- Updated from specific date: 
+`is:pr updated:>yyyy-mm-dd`
+- Merged PRs: 
+ `is:pr is:merged author:[your username]`
+- Approved PRs: 
+`is:pr review:approved author:[your username]`

.gitmodules

@@ -2,3 +2,7 @@
 	path = translations
 	url = https://git.torproject.org/translation.git
 	branch = https_everywhere
+
+[submodule "lib-wasm"]
+	path = lib-wasm
+	url = https://github.com/EFForg/https-everywhere-lib-wasm.git

.travis.yml

@@ -1,11 +1,12 @@
 sudo: required
 os: linux
-dist: trusty
+dist: bionic
 language: python
 python: 3.6
 group: bionic
 services:
   - docker
+  - xvfb
 matrix:
   fast_finish: true
   include:
@@ -16,7 +17,7 @@ matrix:
     - env: TEST="unittests"
       language: node_js
       node_js:
-        - "lts/*"
+        - "lts/dubnium"
     - env: TEST="validations"
     - env: TEST="fetch"
     - env: TEST="preloaded"
@@ -32,8 +33,5 @@ matrix:
     - addons:
         firefox: latest-esr
       env: TEST="firefox esr" BROWSER=firefox
-before_install:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 before_script: travis_retry test/setup_travis.sh
 script: . test/run_travis.sh

chromium/.eslintrc.json

@@ -19,6 +19,7 @@
   },
   "globals": {
     "exports": true,
-    "require": true
+    "require": true,
+    "wasm_bindgen": true
   }
 }