commit 1c472c7aeff5f81b1d8e8357e37168520d14a36a Author: Arthur Edelstein arthuredelstein@gmail.com Date: Fri Jun 22 00:14:35 2018 +0000

Revert "Bug 26428: add temporary fix to avoid https-e submodule error"

This reverts commit b3cc97d4e4adb4709c1e367d82bd1e389bba60f0.

First part of Bug 26451. --- projects/https-everywhere/config | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index c55933e..2385c5c 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,12 +1,10 @@ # vim: filetype=yaml sw=2 version: 2018.6.13 -git_url: https://github.com/boklm/https-everywhere -# Temporary fix for #26428 -git_hash: 53091373b8e4a78504dd2ddc55f953a267a7de87 +git_url: https://git.torproject.org/https-everywhere.git +git_hash: '[% c("version") %]' git_submodule: 1 gpg_keyring: https-everywhere.gpg -# Temporarily disable gpg check for #26428 -#tag_gpg_id: 1 +tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid