@@ -297,7 +297,7 @@

     <p>Starting with Tor Browser 4.5a4 we sign our MAR files which helps

     securing our update process. The downside of this is the need for additional

     instructions to verify that the MAR files we ship are indeed the ones we

-    produced with our Gitian setup.</p>

+    produced with our rbm setup.</p>

     <p>Assuming the verification happens on a Linux computer one first needs the

     <tt>mar-tools-linux*.zip</tt> out of the <tt>gitian-builder/inputs</tt>

@@ -94,14 +94,13 @@

     <h3>Windows</h3>

     <hr>

-    <p>You need to have GnuPG installed before

-    you can verify signatures. Download it from <a

-    href="https://gpg4win.org/download.html">https://gpg4win.org/download.html</a>.</p>

+    <p>First of all you need to have GnuPG installed before you can verify signatures.

+    Download it from <a href="https://gpg4win.org/download.html">https://gpg4win.org/download.html</a>.</p>

     <p>Once it's installed, use GnuPG to import the key that signed your

-    package. Since GnuPG for Windows is a command-line tool, you will need

-    to use <i>cmd.exe</i>. Unless you edit your PATH environment variable,

-    you will need to tell Windows the full path to the GnuPG program. If

-    you installed GnuPG with the default values, the path should be

+    package. In order to verify the signature you will need to type a few commands

+    in windows command-line, <i>cmd.exe</i>.

+    <p>Unless you edit your PATH environment variable, you will need to tell Windows

+    the full path to the GnuPG program. If you installed GnuPG with the default values, the path should be

     something like this: <i>C:\Program Files\Gnu\GnuPg\gpg.exe</i>.</p>

     <p>The Tor Browser team signs Tor Browser releases. Import its key

     (0x4E2C6E8793298290) by starting <i>cmd.exe</i> and typing:</p>

@@ -18,17 +18,16 @@

     the one we have created and has not been modified by some attacker.</p>

     <p>Digital signature is a cryptographic mechanism. If you want to learn more

-    about how it works see <a href="https://www.gnupg.org/documentation/">

-    https://www.gnupg.org/documentation/</a>.</p>

+    about how it works see <a href="https://en.wikipedia.org/wiki/Digital_signature">

+    https://en.wikipedia.org/wiki/Digital_signature</a>.</p>

     <h3>What is a signature and why should I check it?</h3>

     <hr>

     <p>How do you know that the Tor program you have is really the one we made?

     Digital signatures ensure that the package you are downloading was created by

-    our developers. It uses a cryptographic mechanism which outputs a sequence of

-    characters that is always the same unless the software has not been tampered

-    with.</p>

+    our developers. It uses a cryptographic mechanism to ensure that the software package

+    that you have just downloaded is authentic. </p>

     <p>For many Tor users it is important to verify that the Tor software is authentic

     as they have very real adversaries who might try to give them a fake version

@@ -37,11 +36,18 @@

     <p>If the Tor package has been modified by some attacker it is not safe to use.

     It doesn't matter how secure and anonymous Tor is if you're not running the real Tor.</p>

+    <p>Before you go ahead and download something, there are a few extra steps you

+    should take to make sure you have downloaded an authentic version of Tor.</p>

+

+    <h4>Always download Tor from torproject.org</h4>

+

     <p>There are a variety of attacks that can be used to make you download a fake

     version of Tor. For example, an attacker could trick you into thinking some other

-    website is a great place to download Tor. That's why you should

+    website is a great place to download Tor. You should

     always download Tor from <a href="https://www.torproject.org"><b>https</b>://www.torproject.org/</a>.</p>

+    <h4>Always make sure you are browsing over https</h4>

+

     <p><a href="https://www.torproject.org">https://www.torproject.org/</a> uses https.

     Https is the secure version of the http protocol which uses encryption and authentication between your

     browser and the website. This makes it much harder for the attacker

@@ -55,6 +61,8 @@

     attackers who have the ability to trick your browser into thinking

     you're talking to the Tor website with https when you're not.</p>

+    <h4>Always verify signatures of packages you have downloaded</h4>

+

     <p>Some software sites list <a

     href="https://en.wikipedia.org/wiki/Cryptographic_hash_function">sha1

     hashes</a> alongside the software on their website, so users can

@@ -116,6 +124,7 @@

     <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify \

     C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc \

     C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe</pre>

+    <p>Please substitute "Alice" with your own username.</p>

     <p>The output should say "Good signature": </p>

     <pre>

     gpg: Signature made Tue 24 Jan 2015 09:29:09 AM CET using RSA key ID D40814E0

@@ -12,24 +12,44 @@

     <h1>How to verify signatures for packages</h1>

     <hr>

+    <p>Digital signature is a process ensuring that a certain package was

+    generated by its developers and has not been tampered with. Below we explain

+    why it is important and how to verify that the Tor program you download is

+    the one we have created and has not been modified by some attacker.</p>

+

+    <p>Digital signature is a cryptographic mechanism. If you want to learn more

+    about how it works see <a href="https://www.gnupg.org/documentation/">

+    https://www.gnupg.org/documentation/</a>.</p>

+

     <h3>What is a signature and why should I check it?</h3>

     <hr>

-    <p>How do you know that the Tor program you have is really the

-    one we made? Many Tor users have very real adversaries who might

-    try to give them a fake version of Tor — and it doesn't matter

-    how secure and anonymous Tor is if you're not running the real Tor.</p>

+    <p>How do you know that the Tor program you have is really the one we made?

+    Digital signatures ensure that the package you are downloading was created by

+    our developers. It uses a cryptographic mechanism which outputs a sequence of

+    characters that is always the same unless the software has not been tampered

+    with.</p>

+

+    <p>For many Tor users it is important to verify that the Tor software is authentic

+    as they have very real adversaries who might try to give them a fake version

+    of Tor.</p>

-    <p>An attacker could try a variety of attacks to get you to download

-    a fake Tor. For example, he could trick you into thinking some other

+    <p>If the Tor package has been modified by some attacker it is not safe to use.

+    It doesn't matter how secure and anonymous Tor is if you're not running the real Tor.</p>

+

+    <p>There are a variety of attacks that can be used to make you download a fake

+    version of Tor. For example, an attacker could trick you into thinking some other

     website is a great place to download Tor. That's why you should

-    always download Tor from <b>https</b>://www.torproject.org/. The

-    https part means there's encryption and authentication between your

-    browser and the website, making it much harder for the attacker

+    always download Tor from <a href="https://www.torproject.org"><b>https</b>://www.torproject.org/</a>.</p>

+

+    <p><a href="https://www.torproject.org">https://www.torproject.org/</a> uses https.

+    Https is the secure version of the http protocol which uses encryption and authentication between your

+    browser and the website. This makes it much harder for the attacker

     to modify your download. But it's not perfect. Some places in the

-    world block the Tor website, making users try <a href="<page

-    docs/faq>#GetTor">somewhere else</a>. Large

-    companies sometimes force employees to use a modified browser,

+    world block the Tor website, making users to download Tor <a href="<page

+    docs/faq>#GetTor">somewhere else</a>.</p>

+

+    <p>Large companies sometimes force employees to use a modified browser,

     so the company can listen in on all their browsing. We've even <a

     href="https://blog.torproject.org/blog/diginotar-debacle-and-what-you-should-do-about-it">seen</a>

     attackers who have the ability to trick your browser into thinking

@@ -93,8 +113,8 @@

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

     package and its signature to your Desktop, run:</p>

-    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify

-    C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc

+    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify \

+    C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc \

     C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe</pre>

     <p>The output should say "Good signature": </p>

     <pre>

@@ -154,7 +154,7 @@

     <pre>gpg --verify ~/Downloads/TorBrowser-<version-torbrowserbundleosx64>-osx64_en-US.dmg{.asc*,}</pre>

     <strong>For Linux users</strong> (change 64 to 32 if you have the 32-bit package):<br />

-    <pre>gpg --verify tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.xz.asc

+    <pre>gpg --verify tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.xz.asc \

     tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.xz</pre>

     <p>The output should say "Good signature":</p>

@@ -153,9 +153,9 @@

     <strong>For Mac OS X users</strong>:<br />

     <pre>gpg --verify ~/Downloads/TorBrowser-<version-torbrowserbundleosx64>-osx64_en-US.dmg{.asc*,}</pre>

-    <strong>For Linux users</strong> (change 32 to 64 if you have the 64-bit package):<br />

-    <pre>gpg --verify tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz.asc

-    tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz</pre>

+    <strong>For Linux users</strong> (change 64 to 32 if you have the 32-bit package):<br />

+    <pre>gpg --verify tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.xz.asc

+    tor-browser-linux64-<version-torbrowserbundlelinux64>_en-US.tar.xz</pre>

     <p>The output should say "Good signature":</p>

@@ -214,8 +214,8 @@

       file, and the <tt>sha256sums-unsigned-build.txt.asc</tt> signature file.

       They can all be found in the same directory under

       <a href="https://www.torproject.org/dist/torbrowser/">

-      https://www.torproject.org/dist/torbrowser/</a>, for example in '<version-torbrowserbundlelinux32>'

-      for Tor Browser <version-torbrowserbundlelinux32>.</li>

+      https://www.torproject.org/dist/torbrowser/</a>, for example in '<version-torbrowserbundlelinux64>'

+      for Tor Browser <version-torbrowserbundlelinux64>.</li>

       <li>In case your operating system is adding the .txt extension

       automatically to the SHA256 sums signature file strip it again by running

       <pre>mv sha256sums-unsigned-build.txt.asc.txt sha256sums-unsigned-build.txt.asc</pre>

@@ -93,7 +93,9 @@

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

     package and its signature to your Desktop, run:</p>

-    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe</pre>

+    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify

+    C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc

+    C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe</pre>

     <p>The output should say "Good signature": </p>

     <pre>

     gpg: Signature made Tue 24 Jan 2015 09:29:09 AM CET using RSA key ID D40814E0

@@ -152,7 +154,8 @@

     <pre>gpg --verify ~/Downloads/TorBrowser-<version-torbrowserbundleosx64>-osx64_en-US.dmg{.asc*,}</pre>

     <strong>For Linux users</strong> (change 32 to 64 if you have the 64-bit package):<br />

-    <pre>gpg --verify tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz.asc tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz</pre>

+    <pre>gpg --verify tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz.asc

+    tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz</pre>

     <p>The output should say "Good signature":</p>

@@ -152,7 +152,7 @@

     <pre>gpg --verify ~/Downloads/TorBrowser-<version-torbrowserbundleosx64>-osx64_en-US.dmg{.asc*,}</pre>

     <strong>For Linux users</strong> (change 32 to 64 if you have the 64-bit package):<br />

-    <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz{.asc*,}</pre>

+    <pre>gpg --verify tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz.asc tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz</pre>

     <p>The output should say "Good signature":</p>

@@ -57,8 +57,8 @@

     torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc. For a list

     of which developer signs which package, see our <a href="<page docs/signing-keys>">signing keys</a> page.</p>

-    <p>We now show how you can verify the downloaded file digital signature on

-    different Operating systems. Please notice that a signature is dated the moment

+    <p>We now show how you can verify the downloaded file's digital signature on

+    different operating systems. Please notice that a signature is dated the moment

     the package has been signed. Therefore every time a new file is uploaded a new

     signature is generated with a different date. As long as you have verified the

     signature you should not worry that the reported date may vary.

@@ -56,6 +56,14 @@

     torbrowser-install-<version-torbrowserbundle>_en-US.exe is accompanied by

     torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc. For a list

     of which developer signs which package, see our <a href="<page docs/signing-keys>">signing keys</a> page.</p>

+

+    <p>We now show how you can verify the downloaded file digital signature on

+    different Operating systems. Please notice that a signature is dated the moment

+    the package has been signed. Therefore every time a new file is uploaded a new

+    signature is generated with a different date. As long as you have verified the

+    signature you should not worry that the reported date may vary.

+    </p>

+

     <h3>Windows</h3>

     <hr>

     <p>You need to have GnuPG installed before

@@ -105,6 +113,7 @@

     to the developer. The best method is to meet the developer in person and

     exchange key fingerprints.

     </p>

+

     <h3>Mac OS X and Linux</h3>

     <hr>

@@ -283,4 +292,3 @@

 </div>

 <!-- END CONTENT -->

 #include <foot.wmi>

-

@@ -230,7 +230,10 @@

       Windows you can use the <a href="http://md5deep.sourceforge.net/">

       hashdeep utility</a> and run

       <pre>C:\location\where\you\saved\hashdeep -c sha256sum &lt;TOR BROWSER FILE NAME&gt;.exe</pre>

-      On Mac or Linux you can run <pre>shasum -a 256 &lt;TOR BROWSER FILE NAME&gt;.dmg</pre> or <pre>sha256sum &lt;TOR BROWSER FILE NAME&gt;.tar.gz</pre> without having to download a utility.</li>

+      <p>On Linux you can run</p>

+      <pre>sha256sum &lt;TOR BROWSER FILE NAME&gt;.tar.gz</pre>

+      without having to download a utility. Note: this does not work for OS X

+      yet due to Apple's codesigning requirement.</li>

       <li>You will see a string of letters and numbers.</li>

       <li>Open <tt>sha256sums-unsigned-build.txt</tt> in a text editor.</li>

       <li>Locate the name of the Tor Browser file you downloaded.</li>

@@ -67,7 +67,7 @@

     you will need to tell Windows the full path to the GnuPG program. If

     you installed GnuPG with the default values, the path should be

     something like this: <i>C:\Program Files\Gnu\GnuPg\gpg.exe</i>.</p>

-    <p>The Tor Browser team signs the Tor Browsers. Import its key

+    <p>The Tor Browser team signs Tor Browser releases. Import its key

     (0x4E2C6E8793298290) by starting <i>cmd.exe</i> and typing:</p>

     <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

     <p>After importing the key, you can verify that the fingerprint

@@ -116,7 +116,7 @@

     </p>

     <p>The next step is to use GnuPG to import the key that signed

-    your package. The Tor Browser team signs the Tor Browsers. Import its

+    your package. The Tor Browser team signs Tor Browser releases. Import its

     key (0x4E2C6E8793298290) by starting the terminal (under "Applications"

     in Mac OS X) and typing:</p>

@@ -189,7 +189,7 @@

        property</a> of Tor Browser 3.0 and later. Anyone can build

        Tor Browser on their own machine and produce a binary that is

        bit-for-bit identical to the binary we offer on the download page.

-       Fortunately, it is not necessary for everyone to build the Tor Browser

+       Fortunately, it is not necessary for everyone to build Tor Browser

        locally to get this security. Verifying and comparing the signed list

        of <a href="https://en.wikipedia.org/wiki/Cryptographic_hash">hashes</a>

        will confirm that multiple people have built Tor Browsers

@@ -80,6 +80,7 @@

     uid                  Tor Browser Developers (signing key) <torbrowser@torproject.org>

     sub   4096R/F65C2036 2014-12-15

     sub   4096R/D40814E0 2014-12-15

+    sub   4096R/C3C07136 2016-08-24

 </pre>

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

@@ -95,7 +96,8 @@

     <p>Currently valid subkey fingerprints are:

     <pre>

     5242 013F 02AF C851 B1C7  36B8 7017 ADCE F65C 2036

-    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0</pre></p>

+    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0

+    A430 0A6B C93C 0877 A445  1486 D148 3FA6 C3C0 7136</pre></p>

     <p>

     Notice that there is a warning because you haven't assigned a trust

     index to this person. This means that GnuPG verified that the key made

@@ -131,7 +133,8 @@

           Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290

     uid                  Tor Browser Developers (signing key) <torbrowser@torproject.org>

     sub   4096R/F65C2036 2014-12-15

-    sub   4096R/D40814E0 2014-12-15</pre>

+    sub   4096R/D40814E0 2014-12-15

+    sub   4096R/C3C07136 2016-08-24</pre>

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

     package and its signature to your Downloads folder, run:</p>

@@ -152,7 +155,8 @@

     Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290</pre> <p> Currently valid subkey fingerprints are:

     <pre>

     5242 013F 02AF C851 B1C7  36B8 7017 ADCE F65C 2036

-    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0</pre></p>

+    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0

+    A430 0A6B C93C 0877 A445  1486 D148 3FA6 C3C0 7136</pre></p>

     <p>

     Notice that there is a warning because you haven't assigned a trust

     index to this person. This means that GnuPG verified that the key made

@@ -69,7 +69,7 @@

     something like this: <i>C:\Program Files\Gnu\GnuPg\gpg.exe</i>.</p>

     <p>The Tor Browser team signs the Tor Browsers. Import its key

     (0x4E2C6E8793298290) by starting <i>cmd.exe</i> and typing:</p>

-    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

+    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

     <p>After importing the key, you can verify that the fingerprint

     is correct:</p>

     <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --fingerprint 0x4E2C6E8793298290</pre>

@@ -118,7 +118,7 @@

     key (0x4E2C6E8793298290) by starting the terminal (under "Applications"

     in Mac OS X) and typing:</p>

-    <pre>gpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

+    <pre>gpg --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

     <p>After importing the key, you can verify that the fingerprint

     is correct:</p>

@@ -36,7 +36,7 @@

     you're talking to the Tor website with https when you're not.</p>

     <p>Some software sites list <a

-    href="http://en.wikipedia.org/wiki/Cryptographic_hash_function">sha1

+    href="https://en.wikipedia.org/wiki/Cryptographic_hash_function">sha1

     hashes</a> alongside the software on their website, so users can

     verify that they downloaded the file without any errors. These

     "checksums" help you answer the question "Did I download this file

@@ -60,7 +60,7 @@

     <hr>

     <p>You need to have GnuPG installed before

     you can verify signatures. Download it from <a

-    href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a>.</p>

+    href="https://gpg4win.org/download.html">https://gpg4win.org/download.html</a>.</p>

     <p>Once it's installed, use GnuPG to import the key that signed your

     package. Since GnuPG for Windows is a command-line tool, you will need

     to use <i>cmd.exe</i>. Unless you edit your PATH environment variable,

@@ -80,7 +80,6 @@

     uid                  Tor Browser Developers (signing key) <torbrowser@torproject.org>

     sub   4096R/F65C2036 2014-12-15

     sub   4096R/D40814E0 2014-12-15

-    sub   4096R/589839A3 2014-12-15

 </pre>

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

@@ -96,8 +95,7 @@

     <p>Currently valid subkey fingerprints are:

     <pre>

     5242 013F 02AF C851 B1C7  36B8 7017 ADCE F65C 2036

-    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0

-    05FA 4425 3F6C 19A8 B7F5  18D4 2D00 0988 5898 39A3</pre></p>

+    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0</pre></p>

     <p>

     Notice that there is a warning because you haven't assigned a trust

     index to this person. This means that GnuPG verified that the key made

@@ -110,7 +108,7 @@

     <p>You need to have GnuPG installed before you can verify

     signatures. If you are using Mac OS X, you can install it from <a

-    href="http://www.gpgtools.org/">http://www.gpgtools.org/</a>. If you

+    href="https://www.gpgtools.org/">https://www.gpgtools.org/</a>. If you

     are using Linux, then it's probably you already have GnuPG in your

     system, as most Linux distributions come with it preinstalled.

     </p>

@@ -133,17 +131,14 @@

           Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290

     uid                  Tor Browser Developers (signing key) <torbrowser@torproject.org>

     sub   4096R/F65C2036 2014-12-15

-    sub   4096R/D40814E0 2014-12-15

-    sub   4096R/589839A3 2014-12-15

-    </pre>

-

+    sub   4096R/D40814E0 2014-12-15</pre>

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

-    package and its signature to your Desktop, run:</p>

+    package and its signature to your Downloads folder, run:</p>

     <strong>For Mac OS X users</strong>:<br />

-    <pre>gpg --verify ~/Desktop/TorBrowser-<version-torbrowserbundleosx64>-osx64_en-US.dmg{.asc*,}</pre>

-    

+    <pre>gpg --verify ~/Downloads/TorBrowser-<version-torbrowserbundleosx64>-osx64_en-US.dmg{.asc*,}</pre>

+

     <strong>For Linux users</strong> (change 32 to 64 if you have the 64-bit package):<br />

     <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz{.asc*,}</pre>

@@ -157,8 +152,7 @@

     Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290</pre> <p> Currently valid subkey fingerprints are:

     <pre>

     5242 013F 02AF C851 B1C7  36B8 7017 ADCE F65C 2036

-    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0

-    05FA 4425 3F6C 19A8 B7F5  18D4 2D00 0988 5898 39A3</pre></p>

+    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0</pre></p>

     <p>

     Notice that there is a warning because you haven't assigned a trust

     index to this person. This means that GnuPG verified that the key made

@@ -177,7 +171,7 @@

     </p>

     <p>See <a

-    href="http://www.gnupg.org/documentation/">http://www.gnupg.org/documentation/</a>

+    href="https://www.gnupg.org/documentation/">https://www.gnupg.org/documentation/</a>

     to learn more about GnuPG.</p>

     <hr>

@@ -204,14 +198,16 @@

       file, and the <tt>sha256sums-unsigned-build.txt.asc</tt> signature file.

       They can all be found in the same directory under

       <a href="https://www.torproject.org/dist/torbrowser/">

-      https://www.torproject.org/dist/torbrowser/</a>, for example in '4.5.1'

-      for Tor Browser 4.5.1.</li>

+      https://www.torproject.org/dist/torbrowser/</a>, for example in '<version-torbrowserbundlelinux32>'

+      for Tor Browser <version-torbrowserbundlelinux32>.</li>

+      <li>In case your operating system is adding the .txt extension

+      automatically to the SHA256 sums signature file strip it again by running

+      <pre>mv sha256sums-unsigned-build.txt.asc.txt sha256sums-unsigned-build.txt.asc</pre>

       <li>Retrieve the signers' GPG keys. This can be done from the command

       line by entering something like

       <pre>gpg --keyserver keys.mozilla.org --recv-keys 0x4E2C6E8793298290</pre>

       (This will bring you the public part of the Tor Browser developers'

-       signing key. Other

-      developers' key IDs can be found on

+       signing key. Other developers' key IDs can be found on

       <a href="<page docs/signing-keys>">this

       page</a>.)</li>

       <li>Verify the sha256sums-unsigned-build.txt file by executing this

@@ -230,7 +226,7 @@

       Windows you can use the <a href="http://md5deep.sourceforge.net/">

       hashdeep utility</a> and run

       <pre>C:\location\where\you\saved\hashdeep -c sha256sum &lt;TOR BROWSER FILE NAME&gt;.exe</pre>

-      On Mac or Linux you can run <pre>sha256sum &lt;TOR BROWSER FILE NAME&gt;.dmg</pre> or <pre>sha256sum &lt;TOR BROWSER FILE NAME&gt;.tar.gz</pre> without having to download a utility.</li>

+      On Mac or Linux you can run <pre>shasum -a 256 &lt;TOR BROWSER FILE NAME&gt;.dmg</pre> or <pre>sha256sum &lt;TOR BROWSER FILE NAME&gt;.tar.gz</pre> without having to download a utility.</li>

       <li>You will see a string of letters and numbers.</li>

       <li>Open <tt>sha256sums-unsigned-build.txt</tt> in a text editor.</li>

       <li>Locate the name of the Tor Browser file you downloaded.</li>

@@ -241,7 +237,7 @@

     </ul>

     <p><a href="https://github.com/isislovecruft/scripts/blob/master/verify-gitian-builder-signatures">Scripts</a>

-    to <a href="http://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle-tbb-3-x">automate</a>

+    to <a href="https://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle-tbb-3-x">automate</a>

     these steps have been written, but to use them you will need to modify

     them yourself with the latest Tor Browser filename.</p>

@@ -263,6 +259,7 @@

     <pre>

     cd /path/to/MAR/file

     unzip /path/to/gitian-builder/inputs/mar-tools-linux64.zip

+    export LD_LIBRARY_PATH=/path/to/MAR/file/mar-tools

     mar-tools/signmar -r your-signed-mar-file.mar your-unsigned-mar-file.mar</pre>

     <p>Now you can compare the SHA256 sum of <tt>your-unsigned-mar-file.mar</tt>

     with the one provided in the <tt>sha265sums-unsigned-build.txt</tt> or

@@ -200,11 +200,12 @@

       <p>The steps below walk through this process:</p>

     <ul>

-      <li>Download the Tor Browser package, the sha256sums.txt file, and the

-      sha256sums signature files. They can all be found in the same directory

-      under <a href="https://www.torproject.org/dist/torbrowser/">

-      https://www.torproject.org/dist/torbrowser/</a>, for example in '3.6.1'

-      for TBB 3.6.1.</li>

+      <li>Download the Tor Browser package, the <tt>sha256sums-unsigned-build.txt</tt>

+      file, and the <tt>sha256sums-unsigned-build.txt.asc</tt> signature file.

+      They can all be found in the same directory under

+      <a href="https://www.torproject.org/dist/torbrowser/">

+      https://www.torproject.org/dist/torbrowser/</a>, for example in '4.5.1'

+      for Tor Browser 4.5.1.</li>

       <li>Retrieve the signers' GPG keys. This can be done from the command

       line by entering something like

       <pre>gpg --keyserver keys.mozilla.org --recv-keys 0x4E2C6E8793298290</pre>

@@ -213,8 +214,9 @@

       developers' key IDs can be found on

       <a href="<page docs/signing-keys>">this

       page</a>.)</li>

-      <li>Verify the sha256sums.txt file by executing this command:

-      <pre>gpg --verify &lt;NAME OF THE SIGNATURE FILE&gt;.asc sha256sums.txt</pre></li>

+      <li>Verify the sha256sums-unsigned-build.txt file by executing this

+      command:

+      <pre>gpg --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt</pre></li>

       <li>You should see a message like "Good signature from &lt;DEVELOPER

       NAME&gt;". If you don't, there is a problem. Try these steps again.</li>

       <li>If you want to verify a Windows Tor Browser package you need to first

@@ -230,7 +232,7 @@

       <pre>C:\location\where\you\saved\hashdeep -c sha256sum &lt;TOR BROWSER FILE NAME&gt;.exe</pre>

       On Mac or Linux you can run <pre>sha256sum &lt;TOR BROWSER FILE NAME&gt;.dmg</pre> or <pre>sha256sum &lt;TOR BROWSER FILE NAME&gt;.tar.gz</pre> without having to download a utility.</li>

       <li>You will see a string of letters and numbers.</li>

-      <li>Open sha256sums.txt in a text editor.</li>

+      <li>Open <tt>sha256sums-unsigned-build.txt</tt> in a text editor.</li>

       <li>Locate the name of the Tor Browser file you downloaded.</li>

       <li>Compare the string of letters and numbers to the left of your

       filename with the string of letters and numbers that appeared

@@ -263,9 +265,9 @@

     unzip /path/to/gitian-builder/inputs/mar-tools-linux64.zip

     mar-tools/signmar -r your-signed-mar-file.mar your-unsigned-mar-file.mar</pre>

     <p>Now you can compare the SHA256 sum of <tt>your-unsigned-mar-file.mar</tt>

-    with the one provided in the <tt>sha265sums.txt</tt> or

-    <tt>sha256sums.incremental.txt</tt> as outlined in <a href="#BuildVerification">Verifying

-    sha256sums (advancded)</a> above.</p>

+    with the one provided in the <tt>sha265sums-unsigned-build.txt</tt> or

+    <tt>sha256sums-unsigned-build.incremental.txt</tt> as outlined in

+    <a href="#BuildVerification">Verifying sha256sums (advancded)</a> above.</p>

   </div>

   <!-- END MAINCOL -->

@@ -218,10 +218,10 @@

       <li>You should see a message like "Good signature from &lt;DEVELOPER

       NAME&gt;". If you don't, there is a problem. Try these steps again.</li>

       <li>If you want to verify a Windows Tor Browser package you need to first

-      strip off the authenticode signature of it. One tool that can be used for

-      this purpose is <a

-      href="http:/osslsigncode.sourceforge.net">osslsigncode</a>. Assuming you

-      have built it on a Linux computer you can enter

+      strip off the authenticode signature of it. Tools that can be used for

+      this purpose are <a href="http://osslsigncode.sourceforge.net">osslsigncode</a> and

+      <a href="http://forum.xda-developers.com/showthread.php?t=416175">delcert.exe</a>.

+      Assuming you have built e.g. <tt>osslsigncode</tt> on a Linux computer you can enter

       <pre>/path/to/your/osslsigncode remove-signature &#92;

         /path/to/your/&lt;TOR BROWSER FILE NAME&gt;.exe &lt;TOR BROWSER FILE NAME&gt;.exe</pre></li>

       <li>Now you can take the sha256sum of the Tor Browser package. On

@@ -142,7 +142,7 @@

     package and its signature to your Desktop, run:</p>

     <strong>For Mac OS X users</strong>:<br />

-    <pre>gpg --verify ~/Desktop/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg{.asc*,}</pre>

+    <pre>gpg --verify ~/Desktop/TorBrowser-<version-torbrowserbundleosx64>-osx64_en-US.dmg{.asc*,}</pre>

     <strong>For Linux users</strong> (change 32 to 64 if you have the 64-bit package):<br />

     <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz{.asc*,}</pre>

@@ -207,8 +207,9 @@

       for TBB 3.6.1.</li>

       <li>Retrieve the signers' GPG keys. This can be done from the command

       line by entering something like

-      <pre>gpg --keyserver keys.mozilla.org --recv-keys 0x29846B3C683686CC</pre>

-      (This will bring you developer Mike Perry's public key. Other

+      <pre>gpg --keyserver keys.mozilla.org --recv-keys 0x4E2C6E8793298290</pre>

+      (This will bring you the public part of the Tor Browser developers'

+       signing key. Other

       developers' key IDs can be found on

       <a href="<page docs/signing-keys>">this

       page</a>.)</li>

@@ -216,6 +217,13 @@

       <pre>gpg --verify &lt;NAME OF THE SIGNATURE FILE&gt;.asc sha256sums.txt</pre></li>

       <li>You should see a message like "Good signature from &lt;DEVELOPER

       NAME&gt;". If you don't, there is a problem. Try these steps again.</li>

+      <li>If you want to verify a Windows Tor Browser package you need to first

+      strip off the authenticode signature of it. One tool that can be used for

+      this purpose is <a

+      href="http:/osslsigncode.sourceforge.net">osslsigncode</a>. Assuming you

+      have built it on a Linux computer you can enter

+      <pre>/path/to/your/osslsigncode remove-signature &#92;

+        /path/to/your/&lt;TOR BROWSER FILE NAME&gt;.exe &lt;TOR BROWSER FILE NAME&gt;.exe</pre></li>

       <li>Now you can take the sha256sum of the Tor Browser package. On

       Windows you can use the <a href="http://md5deep.sourceforge.net/">

       hashdeep utility</a> and run

@@ -92,8 +92,12 @@

     gpg: Good signature from "Tor Browser Developers (signing key) <torbrowser@torproject.org>"

     gpg: WARNING: This key is not certified with a trusted signature!

     gpg:          There is no indication that the signature belongs to the owner.

-    Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290

-    </pre>

+    Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290</pre>

+    <p>Currently valid subkey fingerprints are:

+    <pre>

+    5242 013F 02AF C851 B1C7  36B8 7017 ADCE F65C 2036

+    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0

+    05FA 4425 3F6C 19A8 B7F5  18D4 2D00 0988 5898 39A3</pre></p>

     <p>

     Notice that there is a warning because you haven't assigned a trust

     index to this person. This means that GnuPG verified that the key made

@@ -143,16 +147,18 @@

     <strong>For Linux users</strong> (change 32 to 64 if you have the 64-bit package):<br />

     <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz{.asc*,}</pre>

-    <p>The output should say "Good signature": </p>

+    <p>The output should say "Good signature":</p>

     <pre>

     gpg: Signature made Tue 24 Jan 2015 09:29:09 AM CET using RSA key ID D40814E0

     gpg: Good signature from "Tor Browser Developers (signing key) <torbrowser@torproject.org>"

     gpg: WARNING: This key is not certified with a trusted signature!

     gpg:          There is no indication that the signature belongs to the owner.

-    Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290

-    </pre>

-

+    Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290</pre> <p> Currently valid subkey fingerprints are:

+    <pre>

+    5242 013F 02AF C851 B1C7  36B8 7017 ADCE F65C 2036

+    BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0

+    05FA 4425 3F6C 19A8 B7F5  18D4 2D00 0988 5898 39A3</pre></p>

     <p>

     Notice that there is a warning because you haven't assigned a trust

     index to this person. This means that GnuPG verified that the key made

@@ -160,7 +166,7 @@

     to the developer. The best method is to meet the developer in person and

     exchange key fingerprints.

     </p>

-    

+

     <p>

     If you're a Linux user and you're using the <b>Debian</b> Tor (not Tor

     Browser) packages, you should read the instructions on <a

@@ -112,8 +112,8 @@

     </p>

     <p>The next step is to use GnuPG to import the key that signed

-    your package. Erinn Clark signs the Tor Browsers. Import her

-    key (0x416F061063FEE659) by starting the terminal (under "Applications"

+    your package. The Tor Browser team signs the Tor Browsers. Import its

+    key (0x4E2C6E8793298290) by starting the terminal (under "Applications"

     in Mac OS X) and typing:</p>

     <pre>gpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

@@ -53,8 +53,8 @@

     package and the extension ".asc". These .asc files are GPG

     signatures. They allow you to verify the file you've downloaded

     is exactly the one that we intended you to get. For example,

-    tor-browser-2.3.25-13_en-US.exe is accompanied by

-    tor-browser-2.3.25-13_en-US.exe.asc. For a list

+    torbrowser-install-<version-torbrowserbundle>_en-US.exe is accompanied by

+    torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc. For a list

     of which developer signs which package, see our <a href="<page docs/signing-keys>">signing keys</a> page.</p>

     <h3>Windows</h3>

     <hr>

@@ -67,20 +67,20 @@

     you will need to tell Windows the full path to the GnuPG program. If

     you installed GnuPG with the default values, the path should be

     something like this: <i>C:\Program Files\Gnu\GnuPg\gpg.exe</i>.</p>

-    <p>Erinn Clark signs the Tor Browsers. Import her key

-    (0x416F061063FEE659) by starting <i>cmd.exe</i> and typing:</p>

-    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x416F061063FEE659</pre>

+    <p>The Tor Browser team signs the Tor Browsers. Import its key

+    (0x4E2C6E8793298290) by starting <i>cmd.exe</i> and typing:</p>

+    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

     <p>After importing the key, you can verify that the fingerprint

     is correct:</p>

-    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --fingerprint 0x416F061063FEE659</pre>

+    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --fingerprint 0x4E2C6E8793298290</pre>

     <p>You should see:</p>

     <pre>

-    pub   2048R/63FEE659 2003-10-16

-          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659

-    uid                  Erinn Clark <erinn@torproject.org>

-    uid                  Erinn Clark <erinn@debian.org>

-    uid                  Erinn Clark <erinn@double-helix.org>

-    sub   2048R/EB399FD7 2003-10-16

+    pub   4096R/93298290 2014-12-15

+          Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290

+    uid                  Tor Browser Developers (signing key) <torbrowser@torproject.org>

+    sub   4096R/F65C2036 2014-12-15

+    sub   4096R/D40814E0 2014-12-15

+    sub   4096R/589839A3 2014-12-15

 </pre>

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

@@ -88,13 +88,11 @@

     <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe</pre>

     <p>The output should say "Good signature": </p>

     <pre>

-    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659

-    gpg: Good signature from "Erinn Clark <erinn@torproject.org>"

-    gpg:                 aka "Erinn Clark <erinn@debian.org>"

-    gpg:                 aka "Erinn Clark <erinn@double-helix.org>"

+    gpg: Signature made Tue 24 Jan 2015 09:29:09 AM CET using RSA key ID D40814E0

+    gpg: Good signature from "Tor Browser Developers (signing key) <torbrowser@torproject.org>"

     gpg: WARNING: This key is not certified with a trusted signature!

     gpg:          There is no indication that the signature belongs to the owner.

-    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659

+    Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290

     </pre>

     <p>

     Notice that there is a warning because you haven't assigned a trust

@@ -118,21 +116,21 @@

     key (0x416F061063FEE659) by starting the terminal (under "Applications"

     in Mac OS X) and typing:</p>

-    <pre>gpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x416F061063FEE659</pre>

+    <pre>gpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre>

     <p>After importing the key, you can verify that the fingerprint

     is correct:</p>

-    <pre>gpg --fingerprint 0x416F061063FEE659</pre>

+    <pre>gpg --fingerprint 0x4E2C6E8793298290</pre>

     <p>You should see:</p>

     <pre>

-    pub   2048R/63FEE659 2003-10-16

-          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659

-    uid                  Erinn Clark <erinn@torproject.org>

-    uid                  Erinn Clark <erinn@debian.org>

-    uid                  Erinn Clark <erinn@double-helix.org>

-    sub   2048R/EB399FD7 2003-10-16

+    pub   4096R/93298290 2014-12-15

+          Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290

+    uid                  Tor Browser Developers (signing key) <torbrowser@torproject.org>

+    sub   4096R/F65C2036 2014-12-15

+    sub   4096R/D40814E0 2014-12-15

+    sub   4096R/589839A3 2014-12-15

     </pre>

     <p>To verify the signature of the package you downloaded, you will need

@@ -148,13 +146,11 @@

     <p>The output should say "Good signature": </p>

     <pre>

-    gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659

-    gpg: Good signature from "Erinn Clark <erinn@torproject.org>"

-    gpg:                 aka "Erinn Clark <erinn@debian.org>"

-    gpg:                 aka "Erinn Clark <erinn@double-helix.org>"

+    gpg: Signature made Tue 24 Jan 2015 09:29:09 AM CET using RSA key ID D40814E0

+    gpg: Good signature from "Tor Browser Developers (signing key) <torbrowser@torproject.org>"

     gpg: WARNING: This key is not certified with a trusted signature!

     gpg:          There is no indication that the signature belongs to the owner.

-    Primary key fingerprint: 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659

+    Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290

     </pre>

     <p>

@@ -142,7 +142,7 @@

     <strong>For Mac OS X users</strong>:<br />

     <pre>gpg --verify ~/Desktop/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg{.asc*,}</pre>

-    <strong>For Linux users</strong> (change 32 by 64 if you have the 64-bit package):<br />

+    <strong>For Linux users</strong> (change 32 to 64 if you have the 64-bit package):<br />

     <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz{.asc*,}</pre>

     <p>The output should say "Good signature": </p>

@@ -85,7 +85,7 @@

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

     package and its signature to your Desktop, run:</p>

-    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify C:\Users\Alice\Desktop\tor-browser-2.3.25-13_en-US.exe.asc C:\Users\Alice\Desktop\tor-browser-2.3.25-13_en-US.exe</pre>

+    <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe</pre>

     <p>The output should say "Good signature": </p>

     <pre>

     gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659

@@ -137,14 +137,13 @@

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

-    package and its signature to your Desktop, run (where <version> stands

-    for the version of Tor Browser you downloaded):</p>

+    package and its signature to your Desktop, run:</p>

-    <strong>For Mac OS X users</strong>:

-    <pre>gpg --verify ~/Desktop/TorBrowser-<version>-osx32_en-US.dmg{.asc*,}</pre>

+    <strong>For Mac OS X users</strong>:<br />

+    <pre>gpg --verify ~/Desktop/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg{.asc*,}</pre>

-    <strong>For Linux users</strong> (change 32 by 64 if you have the 64-bit package):

-    <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version>_en-US.tar.xz{.asc*,}</pre>

+    <strong>For Linux users</strong> (change 32 by 64 if you have the 64-bit package):<br />

+    <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz{.asc*,}</pre>

     <p>The output should say "Good signature": </p>

@@ -177,7 +177,9 @@

     <p>See <a

     href="http://www.gnupg.org/documentation/">http://www.gnupg.org/documentation/</a>

-    to learn more about GPG.</p>

+    to learn more about GnuPG.</p>

+

+    <hr>

     <a id="BuildVerification"></a>

     <h3><a class="anchor" href="#BuildVerification">

@@ -103,18 +103,20 @@

     to the developer. The best method is to meet the developer in person and

     exchange key fingerprints.

     </p>

-    <h3>Mac OS X</h3>

+    <h3>Mac OS X and Linux</h3>

     <hr>

     <p>You need to have GnuPG installed before you can verify

-    signatures. You can install it from <a

-    href="http://www.gpgtools.org/">http://www.gpgtools.org/</a>.

+    signatures. If you are using Mac OS X, you can install it from <a

+    href="http://www.gpgtools.org/">http://www.gpgtools.org/</a>. If you

+    are using Linux, then it's probably you already have GnuPG in your

+    system, as most Linux distributions come with it preinstalled.

     </p>

-    <p>Once it's installed, use GnuPG to import the key that signed

+    <p>The next step is to use GnuPG to import the key that signed

     your package. Erinn Clark signs the Tor Browsers. Import her

-    key (0x416F061063FEE659) by starting the terminal (under "Applications")

-    and typing:</p>

+    key (0x416F061063FEE659) by starting the terminal (under "Applications"

+    in Mac OS X) and typing:</p>

     <pre>gpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x416F061063FEE659</pre>

@@ -135,9 +137,14 @@

     <p>To verify the signature of the package you downloaded, you will need

     to download the ".asc" file as well. Assuming you downloaded the

-    package and its signature to your Desktop, run:</p>

+    package and its signature to your Desktop, run (where <version> stands

+    for the version of Tor Browser you downloaded):</p>