diff --git a/chromium/manifest.json b/chromium/manifest.json index 444830ecf916..68af1631eae5 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -46,5 +46,5 @@ "storage", "*://*/*" ], - "version": "2017.8.31" + "version": "2017.9.12" } \ No newline at end of file diff --git a/src/Changelog b/src/Changelog index 283f8b8e23d9..f241de631e6f 100644 --- a/src/Changelog +++ b/src/Changelog @@ -1,3 +1,8 @@ +2017.9.12 + * Decrease memory footprint by using JSON in default.rulesets + * Markup changes + * Ruleset updates + 2017.8.31 * Add counter badge to indicate how many rulesets are active * Use Map instead of Object for targets (improves lookups) diff --git a/src/META-INF/manifest.mf b/src/META-INF/manifest.mf index cba6a4d26fc9..a0dd32fff57f 100644 --- a/src/META-INF/manifest.mf +++ b/src/META-INF/manifest.mf @@ -2,8 +2,8 @@ Manifest-Version: 1.0 Name: install.rdf Digest-Algorithms: MD5 SHA1 -MD5-Digest: Mh9s+NdHOCy944RhQ7Zsfg== -SHA1-Digest: zunWw6i80RnceOBJjf1cea8Li2M= +MD5-Digest: +QunxLu0OwfGjElXjksG+w== +SHA1-Digest: IBWYbbDJ2+xan+hfd39AOI7EGTI= Name: chrome.manifest Digest-Algorithms: MD5 SHA1 @@ -17,8 +17,8 @@ SHA1-Digest: T0K4aYuFx0EUxC7/XGnf6wlJI+g= Name: Changelog Digest-Algorithms: MD5 SHA1 -MD5-Digest: Y7Hl+8NnN1jMt0r9pRSleQ== -SHA1-Digest: BBGiQB4Q4/gVfKQq0Wf+cqwU8LU= +MD5-Digest: gs+oO+TRnmbS5ySLNkKBnQ== +SHA1-Digest: Py/jw00BPnzPSaiaIj5uZtXue3k= Name: chrome/skin/icon-active-48.png Digest-Algorithms: MD5 SHA1 @@ -32,8 +32,8 @@ SHA1-Digest: Y65sMAe8/tAhvaVWqnvGN1fyesc= Name: webextension/background.js Digest-Algorithms: MD5 SHA1 -MD5-Digest: p5BKvzeInfPM8wBaGx3PdA== -SHA1-Digest: mOFbvZWDWGqV9YK0h7RKyF2Hqpw= +MD5-Digest: vGMddgZ5u9MydLYR7Uj80w== +SHA1-Digest: lcNE6qJZEKOb8PJITEglGTeUt90= Name: webextension/devtools-panel.html Digest-Algorithms: MD5 SHA1 @@ -82,13 +82,13 @@ SHA1-Digest: r39R3kp0chqcd7KPlS1wZCwrL84= Name: webextension/incognito-cache-clearing.js Digest-Algorithms: MD5 SHA1 -MD5-Digest: BeIF0bwUjkZ6m5166QV0ow== -SHA1-Digest: NGRFJ58Gwdf8DgcsNJMs/3bLWYU= +MD5-Digest: eo8tsvEQnLHDnEXxYC+uRg== +SHA1-Digest: gsPLa0kLu4Uu+9+T6oUljOPuN3Q= Name: webextension/manifest.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: N9hvYaY0Qa1tKzEmjTDTJw== -SHA1-Digest: +0ji6eUVv2dSMSKgDn8C9FX4QaE= +MD5-Digest: s/Agx8ii+cLWDty3Le7vRw== +SHA1-Digest: xFRWXzK9/ZI1idNNb7Z0p44MWdc= Name: webextension/options.css Digest-Algorithms: MD5 SHA1 @@ -127,8 +127,8 @@ SHA1-Digest: Pn9f97i3AIFlAMf420qZNzvA7DY= Name: webextension/rules.js Digest-Algorithms: MD5 SHA1 -MD5-Digest: 8A6cu9CdpRbFvz+ae/KXFg== -SHA1-Digest: y73mOQZxefgURxFDKb7YhvfToEE= +MD5-Digest: zfcoaIXCtax453lOdLz0uA== +SHA1-Digest: aLbX5nE3ppy2Uwhqgy9Fug7CQXY= Name: webextension/send-message.js Digest-Algorithms: MD5 SHA1 @@ -187,8 +187,8 @@ SHA1-Digest: 7bN3bVRJgEjqLrqP0YhPohnTfd8= Name: webextension/_locales/am/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: gyEwIlxnGHqKINRQd4U/Zg== -SHA1-Digest: wNW6Tq6w9SBjubfKLggROq2pOlU= +MD5-Digest: IjjJBPguG0xvPTmXkzLGfg== +SHA1-Digest: 67M6dVGle13pzznk24O7sKMBoSc= Name: webextension/_locales/am_ET/messages.json Digest-Algorithms: MD5 SHA1 @@ -197,8 +197,8 @@ SHA1-Digest: O/N2Bx4h2BvY0k1U6sR5WpA1uIE= Name: webextension/_locales/ar/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 3wAj0ENZc3dGv7U74leW7Q== -SHA1-Digest: x0KOR3b9VfL+LS6OzQvcniK5tc0= +MD5-Digest: IfqfFevzbGshaBGEysGRAQ== +SHA1-Digest: aLnOm6IdjWbg/qF4Lm9tBifOsic= Name: webextension/_locales/ar_AA/messages.json Digest-Algorithms: MD5 SHA1 @@ -237,8 +237,8 @@ SHA1-Digest: /hNWgkqKRAwJdU6WdJLZ/ClgLrE= Name: webextension/_locales/bg/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: k/HwFsRg/3frmp8UJeHaVg== -SHA1-Digest: mbybOT3rNTL334JZueqXrOXn1sA= +MD5-Digest: gbVT2usBpYqvM7II8gZnQw== +SHA1-Digest: E6sszZ4hZz6HFXj6TfAsp5yOaSk= Name: webextension/_locales/bg_BG/messages.json Digest-Algorithms: MD5 SHA1 @@ -377,18 +377,18 @@ SHA1-Digest: 7bN3bVRJgEjqLrqP0YhPohnTfd8= Name: webextension/_locales/eo/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: ouY33gyQc7o7wzyCPs05lQ== -SHA1-Digest: LqvKuyOGDMXIDyesxP5leaeCnJ4= +MD5-Digest: PZsd4tEgX5sopXzR4a4Rsw== +SHA1-Digest: wYLPi26BEa/j3p9QYSBwfT5iAy0= Name: webextension/_locales/es/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: hZyhaucl8vEkLVU3DGIxcQ== -SHA1-Digest: BReg3cvty8gCn/9BSxiakDpsWRM= +MD5-Digest: 5/xkM2bN0YEPWUM/sM0Mbg== +SHA1-Digest: ubchkYVfMkDt79rLKJkAT4Udn8E= Name: webextension/_locales/es_AR/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: EOloofZLKdzlwiFPzWh8sA== -SHA1-Digest: idGNlGWa/u8IyrQIdw09HCleYxU= +MD5-Digest: qzJdWMzVdaETbHEUOnrk3g== +SHA1-Digest: oZFB8Up3sOguEvjIrVPs+4XZo9A= Name: webextension/_locales/es_CL/messages.json Digest-Algorithms: MD5 SHA1 @@ -422,8 +422,8 @@ SHA1-Digest: YwYYUJ7gyVtxziSERW1TMbHw8bc= Name: webextension/_locales/fa/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Wu3IsSt9r+MlYBezIRdS9Q== -SHA1-Digest: CBYWH6M4D/rLoTiJVSPEfFPBbDE= +MD5-Digest: IvMzqFmc2QxqsFMwXXsziw== +SHA1-Digest: p0il/NWDc1qeSv2Xs/m509CykzY= Name: webextension/_locales/fi/messages.json Digest-Algorithms: MD5 SHA1 @@ -502,8 +502,8 @@ SHA1-Digest: 6i9NvgGJjP3OUgofWUcQv72zDK0= Name: webextension/_locales/hi/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: UGtyFPbEtCv8UIXqK1CVTA== -SHA1-Digest: Dp4ll6ZLQ6PJlrCxqEjYZNLItUs= +MD5-Digest: Y0jqqnN0qswiL6pbDdq5Vw== +SHA1-Digest: vSsS0d1OxLwN5vaqdhd6eaKRhGM= Name: webextension/_locales/hr/messages.json Digest-Algorithms: MD5 SHA1 @@ -522,8 +522,8 @@ SHA1-Digest: 7bN3bVRJgEjqLrqP0YhPohnTfd8= Name: webextension/_locales/hu/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: JKvrVWIRkUbGXUUvmN22bQ== -SHA1-Digest: YemUnOaTcEyr17JkrttRupb5L7w= +MD5-Digest: jZ7Nh/90WhOGqG1DA/pkag== +SHA1-Digest: DbV6FGC20YeW5u/zD6YP/QbjZlQ= Name: webextension/_locales/hy/messages.json Digest-Algorithms: MD5 SHA1 @@ -547,8 +547,8 @@ SHA1-Digest: 1YYdyuDUVCwMfUXM4no2IR/MXrA= Name: webextension/_locales/is/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: N9xX2CQTmlgEC55+lV0hPQ== -SHA1-Digest: 1dlvp6xau0yXj6NDmVmcctgAlPE= +MD5-Digest: Iu6O3AYSwE9Ro5umXeGvCQ== +SHA1-Digest: WIoG7XuveFszj73LyvPBKjdoehI= Name: webextension/_locales/it/messages.json Digest-Algorithms: MD5 SHA1 @@ -592,8 +592,8 @@ SHA1-Digest: oHi8vFBxEZhnhf5kkMNCD8txM7g= Name: webextension/_locales/ko/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: kU5jx5Ghlm0NcU/bqvK+uw== -SHA1-Digest: w8PbIkdtxG36Z/CQK1YxVXjwZwI= +MD5-Digest: pMX6Kb4oEkiGm+IeWgNQLQ== +SHA1-Digest: aQ0vzjXZOVp/0EMTtb//sbQB4is= Name: webextension/_locales/ko_KR/messages.json Digest-Algorithms: MD5 SHA1 @@ -617,8 +617,8 @@ SHA1-Digest: 7bN3bVRJgEjqLrqP0YhPohnTfd8= Name: webextension/_locales/ky/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: d1Tclm9JV81ChY1vVt/auw== -SHA1-Digest: pum65CG4ZtkuU0uCbC9XjhdmyQA= +MD5-Digest: ODEYrb6CnBEeAB40YbBJMg== +SHA1-Digest: jzDIX6nYHrUXlYuiS25KL1pLPvM= Name: webextension/_locales/la/messages.json Digest-Algorithms: MD5 SHA1 @@ -652,8 +652,8 @@ SHA1-Digest: nXzcn/iTyBIsTnUDbEx4JKyVwrE= Name: webextension/_locales/lv/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: vOXh1tkj/x1XGhNfeXsTtw== -SHA1-Digest: QZBVWiX351LkdZbG7kOs3kdhAUY= +MD5-Digest: E+JRK7EdZOgNQ8qdcVoOjQ== +SHA1-Digest: haoTSUfb3cZj6njp4LBDrrdLw10= Name: webextension/_locales/mg/messages.json Digest-Algorithms: MD5 SHA1 @@ -702,8 +702,8 @@ SHA1-Digest: 7bN3bVRJgEjqLrqP0YhPohnTfd8= Name: webextension/_locales/my/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: OURkpsr1AATHRZ+pwlyVWA== -SHA1-Digest: EDNzyaKihJsfU1nD8VazSfCtisQ= +MD5-Digest: jvcxCnOTDlW2B2R5C+5ZbA== +SHA1-Digest: W28rgvu0B8COEjUSMJzus1Xb6e0= Name: webextension/_locales/nah/messages.json Digest-Algorithms: MD5 SHA1 @@ -717,8 +717,8 @@ SHA1-Digest: 7bN3bVRJgEjqLrqP0YhPohnTfd8= Name: webextension/_locales/nb/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: +T8+ub7wqpUn1kec8ClWTA== -SHA1-Digest: irkB0BCQbpMyi6JHRt2IRZnwc9g= +MD5-Digest: 8hpTF7B2nw3eyLixifiJow== +SHA1-Digest: stMeDBQ7fNJ403m9orWIsxQzAJU= Name: webextension/_locales/nds/messages.json Digest-Algorithms: MD5 SHA1 @@ -732,8 +732,8 @@ SHA1-Digest: 7bN3bVRJgEjqLrqP0YhPohnTfd8= Name: webextension/_locales/nl/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: 3UM78bfW62XxcFQuT3trdw== -SHA1-Digest: wuodmpRlrp1MO3ix2ATfEMT0lzE= +MD5-Digest: eozHld+u51BdHvGfmgiV1A== +SHA1-Digest: aV5Q5+8KoINGf7Bs/XoWu/QxY9w= Name: webextension/_locales/nl_BE/messages.json Digest-Algorithms: MD5 SHA1 @@ -742,8 +742,8 @@ SHA1-Digest: Fzxeu4GZZzhJBhnf+g/mGlaW+xA= Name: webextension/_locales/nn/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Yc0HOOL1MsQLqLBNlJF16w== -SHA1-Digest: DGprXTAcsgiyi7NAbLX0Wxt7C54= +MD5-Digest: Sn5XsZObBHhlvz8V+fAzRw== +SHA1-Digest: ybIyxQPjsFEKyA6P4+HPVdHdMTM= Name: webextension/_locales/nso/messages.json Digest-Algorithms: MD5 SHA1 @@ -802,8 +802,8 @@ SHA1-Digest: s+Mewx9/P9SGNiwBOe0Y+DXzyY0= Name: webextension/_locales/pt_BR/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: EsTFk9/6LuG8jvdkynOu3g== -SHA1-Digest: ogDqCs+kxQqlsw7Kys4aFGekO+0= +MD5-Digest: 3+LzKVYhTyM1qMotcPadqw== +SHA1-Digest: y7fkNkjHKIDvO2qlkBBiulcSgh4= Name: webextension/_locales/ro/messages.json Digest-Algorithms: MD5 SHA1 @@ -812,8 +812,8 @@ SHA1-Digest: MnmRFKFmn2dM8nbygDtvfd8Rkrs= Name: webextension/_locales/ru/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: aybAt7O87wZ9Gceb7Gyi3w== -SHA1-Digest: ZTKQH71ygtK+81n2h+CtkfeabQ4= +MD5-Digest: Wzsr0X2HcFluFpesT3cmkg== +SHA1-Digest: 8JGdugFHQG2byKGgHg6vxigr5wk= Name: webextension/_locales/ru@petr1708/messages.json Digest-Algorithms: MD5 SHA1 @@ -912,8 +912,8 @@ SHA1-Digest: 7bN3bVRJgEjqLrqP0YhPohnTfd8= Name: webextension/_locales/sv/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: sbR7RUlbEHMPBqOE9x026Q== -SHA1-Digest: GubsHo8StH+/mEYEU8bfJmIsPIU= +MD5-Digest: xLa7Eo9Ky+JnT7rYZhGTdg== +SHA1-Digest: eSpv2/7Jge0RkIMhFUyZenQLvSE= Name: webextension/_locales/sv_SE/messages.json Digest-Algorithms: MD5 SHA1 @@ -977,8 +977,8 @@ SHA1-Digest: Q5SYWHUziW+WZDR4WC/L2DRtt1g= Name: webextension/_locales/tr/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: Ezrdi5aCzziDi4RfZeCDuA== -SHA1-Digest: ETYvBgeZ6RNSxiw79AhegxmaY9Y= +MD5-Digest: gMuEzBY0A+ekglZ70MtEpQ== +SHA1-Digest: D9LyI41HuvtZ28s7/5T0UHNbLyM= Name: webextension/_locales/tzm/messages.json Digest-Algorithms: MD5 SHA1 @@ -1007,8 +1007,8 @@ SHA1-Digest: lrY282+UOG5Kdmqkgs5P/h//xF4= Name: webextension/_locales/uz/messages.json Digest-Algorithms: MD5 SHA1 -MD5-Digest: SnNOjUTZ2CUv2jdCzMPGwA== -SHA1-Digest: xAlyhfD625MTr/7oIA5cAMCiD9M= +MD5-Digest: AHWG9Cfc1btYxh7ttlV8Vw== +SHA1-Digest: OC0FelRW5WIhcIkoDu6bL5WlU64= Name: webextension/_locales/ve/messages.json Digest-Algorithms: MD5 SHA1 @@ -1107,6 +1107,6 @@ SHA1-Digest: PJqzR54BFgNofExLbYn8DMEyvzE= Name: webextension/rules/default.rulesets Digest-Algorithms: MD5 SHA1 -MD5-Digest: WgsDh0P4OPC2WjE1HQcdoQ== -SHA1-Digest: MEvwkB2T9IrBDGeiASOHzgry8iM= +MD5-Digest: BsK2HmodVbjjOXncRJ18OQ== +SHA1-Digest: YKbWWZFtJe9KQjE7nfqfUBTYPdo= diff --git a/src/META-INF/mozilla.rsa b/src/META-INF/mozilla.rsa index bbbbdec659a0..5acfe436d562 100644 Binary files a/src/META-INF/mozilla.rsa and b/src/META-INF/mozilla.rsa differ diff --git a/src/META-INF/mozilla.sf b/src/META-INF/mozilla.sf index 4d58709c156c..72ff4b7d64de 100644 --- a/src/META-INF/mozilla.sf +++ b/src/META-INF/mozilla.sf @@ -1,4 +1,4 @@ Signature-Version: 1.0 -MD5-Digest-Manifest: J1s2aGliOlVLmofkxv2SBw== -SHA1-Digest-Manifest: 75KD69TawGUARi/99Io3K7uvE6I= +MD5-Digest-Manifest: O83viMFd53XiHTF7eDnC1Q== +SHA1-Digest-Manifest: YzFbtXBuPS9OnNZn7yt1isU3Xzs= diff --git a/src/install.rdf b/src/install.rdf index 81561991a42f..704741bc9283 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -9,7 +9,7 @@ 2 true Encrypt the Web! Automatically use HTTPS security on many sites. - 2017.8.31 + 2017.9.12 true https://www.eff.org/https-everywhere chrome://https-everywhere/skin/icon-active-48.png diff --git a/translations b/translations index 8bb79623189b..26eeab0a0fa2 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 8bb79623189b0ba58f9ffca6c62587f9e081a3ce +Subproject commit 26eeab0a0fa27ae662b1526781e396d29532bf63 diff --git a/utils/duplicate-whitelist.txt b/utils/duplicate-whitelist.txt index 9cdde0dbf15a..bb3e9a4e6b67 100644 --- a/utils/duplicate-whitelist.txt +++ b/utils/duplicate-whitelist.txt @@ -43,7 +43,6 @@ a.abcnews.go.com google.* google.co.* *.google.com -google.com google.com.* gsu.edu hak5.org @@ -83,7 +82,6 @@ nydailynews.com webmail.nyi.net nykeurope.com oag.com -blog.openhub.net careers.peopleclick.com pdu.edu plusme.net @@ -116,7 +114,6 @@ unm.edu businessforums.verizon.net help.walmart.com members.webs.com -weebly.com digitalcommons.wustl.edu openscholarship.wustl.edu www.blogsmithmedia.com @@ -125,6 +122,5 @@ www.google.* www.google.co.* www.google.com.* www.hostingcatalog.com -www.squarefree.com zylon.net www.zylon.net diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index 751b63bade34..bdf17a45d69f 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -2804,7 +2804,6 @@ ac1ed464f262ef1a7c52301ab0d83ee2ca7d7679c0b13bc74d22998f76370845,1,1,SemiAccurat 58cef17a92f366b7e1cde56909c647d27ff2ee35518214d71701a8d109673e17,1,1,Seonet-Multimedia.xml d871287827ed10bf530370fb95f6e2cc1c4a83f33207d1c7cf0c5a7b6a1e32d0,1,1,Sequanux.org.xml 36ba74f8a65f050fcebd3bbbbbbc98e68a75a411b050d1e81edcf201edf4ccb6,1,1,Serato.com.xml -42e8a6d86401e5c677048a6e49fc548749b34db31b00a72093a4d14a600a96c1,1,1,Servage.net.xml 80c5c466f3a3270fdd5ba6db7c396b72da465108aecb6df2287271ced2e64e96,1,1,Server314.com.xml 812db0b2551534929fc4781c2c823d559047c287e7f840ac2e71bad9b7abe1fe,1,1,ServerCrate.com.xml e6ef39254b78f986f8a493f1193e680946b392769ca04089330fbdbc01eab49d,1,1,ServerExpress.co.il.xml