updated TBB mitigation guide

guides/files/tbbmitigation.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+cd $1/Browser/
+mkdir unpack
+mv omni.ja unpack
+cd unpack
+unzip omni.ja
+cd $1/Browser/browser/
+mkdir unpack
+mv omni.ja unpack
+cd unpack
+unzip omni.ja
+cd $1
+find ./Browser/ -type f -print0 | xargs -0 sed -i 's/https\:\/\/firefox\.settings\.services\.mozilla\.com\/v1\/buckets\/main\/collections\/nimbus-desktop-experiments\/records//g'
+find ./Browser/ -type f -print0 | xargs -0 sed -i 's/https\:\/\/firefox\.settings\.services\.mozilla\.com\/v1\/buckets\/main-preview\/collections\/search-config\/records//g'
+find ./Browser/ -type f -print0 | xargs -0 sed -i 's/https\:\/\/firefox\.settings\.services\.mozilla\.com\/v1\/buckets\/main\/collections\/search-config\/records//g'
+find ./Browser/ -type f -print0 | xargs -0 sed -i 's/https\:\/\/firefox\.settings\.services\.mozilla\.com\/v1//g';
+find ./Browser/ -type f -print0 | xargs -0 sed -i 's/onecrl\.content-signature\.mozilla\.org//g'
+find ./Browser/ -type f -print0 | xargs -0 sed -i 's/remote-settings\.content-signature\.mozilla\.org//g'
+find ./Browser/ -type f -print0 | xargs -0 sed -i 's/normandy\.content-signature\.mozilla\.org//g'
+cd $1/Browser/browser/unpack
+rm omni.ja
+zip -0DXqr omni.ja *
+mv omni.ja ..
+cd ..
+rm -r unpack
+cd $1/Browser/unpack
+rm omni.ja
+zip -0DXqr omni.ja *
+mv omni.ja ..
+cd ..
+rm -r unpack
+cd $1
+mkdir -p Browser/distribution/
+echo "{\n\"policies\": {\n\"DisableAppUpdate\": true\n}\n}" > Browser/distribution/policies.json

guides/tbb.html

@@ -22,6 +22,7 @@
 						<p>Please be aware that it is possible there may be even more spyware that needs removing than is covered in this guide.</p>
 						<br/>
 						<p> Besides using the torrc configuration file, or host files, the only way to completely remove the connections is to unpack two omni.ja files, and remove all the addresses, and then re-zip the omni.ja files.</p>
+                        <p>After downloading the latest TBB tarball (in our tests mitigation did not work with TBB from distro repos) either use <a href="files/tbbmitigation.sh">this script</a> (give it your <code>tor-browser_en-US/</code> directory as argument) or follow these instructions:</p>
 						<br/>
 						<p>Find your omni.ja files:</p>
 						<code class="big-code">
@@ -55,7 +56,7 @@
 						</code>
 						<p>Replace the omni.ja files:</p>
 						<code class="big-code">
-							mv omni.ja back.omni.ja
+							rm omni.ja
 							<br/>
 							zip -0DXqr omni.ja *
 							<br/>