@@ -221,7 +221,7 @@ sid, xenial, ...) in place of

 <p>

 Then run the following commands at your command prompt:

 <pre style="margin: 1.5em 0 1.5em 2em">

-gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89

+gpg --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89

 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -

 apt update

 apt install tor deb.torproject.org-keyring

@@ -78,6 +78,7 @@ I run

 <option value="trusty">Ubuntu Trusty Tahr (14.04 LTS)</option>

 <option value="xenial">Ubuntu Xenial Xerus (16.04 LTS)</option>

 <option value="artful">Ubuntu Artful Aardvark (17.10)</option>

+<option value="bionic">Ubuntu Bionic Beaver (18.04 LTS)</option>

 </select>

 and want

 <select id="package"></select>

@@ -136,7 +136,7 @@ Then add this line to your

 <tt>/etc/apt/sources.list</tt>

 file:<br />

 <pre style="margin: 1.5em 0 1.5em 2em">

-deb     http://deb.torproject.org/torproject.org <DISTRIBUTION> main

+deb     https://deb.torproject.org/torproject.org <DISTRIBUTION> main

 </pre>

 where you put the codename of your distribution (i.e. stretch, buster, sid

 or whatever it is)

@@ -209,8 +209,8 @@ download/download-unix>#packagediff">development branch</a> of Tor instead

 (more features and more bugs), you need to add a different set of lines

 to your <tt>/etc/apt/sources.list</tt> file:<br />

 <pre style="margin: 1.5em 0 1.5em 2em">

-deb     http://deb.torproject.org/torproject.org <DISTRIBUTION> main

-deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main

+deb     https://deb.torproject.org/torproject.org <DISTRIBUTION> main

+deb     https://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main

 </pre>

 where you again substitute the name of your distro (stretch, buster,

 sid, xenial, ...) in place of

@@ -244,11 +244,11 @@ If you want to build your own debs from source you must first add an

 appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>.

 <pre style="margin: 1.5em 0 1.5em 2em">

 # For the stable version.

-deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

+deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main

 # For the unstable version.

-deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main

+deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main

+deb-src https://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main

 </pre>

 Substitute the name of your distro (stretch, buster, sid, xenial, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root):

 <pre style="margin: 1.5em 0 1.5em 2em">

@@ -191,10 +191,10 @@ access it you might try to use the name of one of its part instead.  Try

 <code>tor.mirror.youam.de</code>.

 </p>

-<p><code>deb.torproject.org</code> is also served through now also served via THS:

-<a href="http://sdscoq7snqtznauu.onion">​http://sdscoq7snqtznauu.onion/</a>.

+<p><code>deb.torproject.org</code> is also served through now also served via onion service:

+<a href="http://sdscoq7snqtznauu.onion">http://sdscoq7snqtznauu.onion/</a>.

 <br />

-See ​<a href="https://onion.torproject.org/">https://onion.torproject.org</a> for all

+See <a href="https://onion.torproject.org/">https://onion.torproject.org</a> for all

 torproject.org onion addresses.</p>

 <hr />

@@ -191,6 +191,12 @@ access it you might try to use the name of one of its part instead.  Try

 <code>tor.mirror.youam.de</code>.

 </p>

+<p><code>deb.torproject.org</code> is also served through now also served via THS:

+<a href="http://sdscoq7snqtznauu.onion">​http://sdscoq7snqtznauu.onion/</a>.

+<br />

+See ​<a href="https://onion.torproject.org/">https://onion.torproject.org</a> for all

+torproject.org onion addresses.</p>

+

 <hr />

 <a id="development"></a>

@@ -25,10 +25,10 @@ If you're using Debian, just run

 as root.

 </p>

-<p>

-Note that this might not always give you the latest stable Tor version, but

-you will receive important security fixes. To make sure that you're running

-the latest stable version of Tor, see option two below.

+<p>Debian provides the <a href="https://packages.debian.org/stretch/tor">LTS</a>

+version of Tor. Note that this might not always give you the latest stable

+Tor version, but you will receive important security fixes. To make sure

+that you're running the latest stable version of Tor, see option two below.

 </p>

 <p>

@@ -52,8 +52,8 @@ and security fixes.

 </p>

 <p>

-<b>Raspbian is not Debian.</b> These packages will be confusingly broken

-for Raspbian users, since Raspbian called their architecture armhf but

+<b>Raspbian is not Debian.</b> Tor might run fine on the Raspberry Pi 2 / 3 but not the first generation Pi.

+These packages might be confusingly broken for Raspbian users, since Raspbian called their architecture armhf but

 Debian already has an armhf. See <a

 href="http://tor.stackexchange.com/questions/242/how-to-run-tor-on-raspbian-on-the-raspberry-pi">this

 post</a> for details.

@@ -89,7 +89,7 @@ version

 <div id="apt-source">

 <p>You need to add the following entry in <code>/etc/apt/sources.list</code> or a new file in <code>/etc/apt/sources.list.d/</code>:</p>

-<blockquote><pre id="sources">deb https://deb.torproject.org/torproject.org stretch main

+<blockquote><pre id="sources">deb https://deb.torproject.org/torproject.org jessie main

 </pre></blockquote>

 </div>

@@ -93,7 +93,7 @@ version

 </pre></blockquote>

 </div>

-<p>Please not that the <a href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https package</a> is required to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).</p>

+<p>Please note that the <a href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https package</a> is required to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).</p>

 <div id="sig">

 <p>Then add the gpg key used to sign the packages by running the following commands at your command prompt:</p>

@@ -63,7 +63,7 @@ post</a> for details.

 You'll need to set up our package repository before you can fetch

 Tor. First, you need to figure out the name of your distribution. A

 quick command to run is <tt>lsb_release -c</tt> or <tt>cat /etc/debian_version</tt>.

-If in doubt about your Debian version, check <a href="http://www.debian.org/releases/">the Debian website</a>.

+If in doubt about your Debian version, check <a href="https://www.debian.org/releases/">the Debian website</a>.

 For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Table_of_versions">Wikipedia</a>.

 </p>

@@ -89,10 +89,12 @@ version

 <div id="apt-source">

 <p>You need to add the following entry in <code>/etc/apt/sources.list</code> or a new file in <code>/etc/apt/sources.list.d/</code>:</p>

-<blockquote><pre id="sources">deb http://deb.torproject.org/torproject.org jessie main

+<blockquote><pre id="sources">deb https://deb.torproject.org/torproject.org stretch main

 </pre></blockquote>

 </div>

+<p>Please not that the <a href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https package</a> is required to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).</p>

+

 <div id="sig">

 <p>Then add the gpg key used to sign the packages by running the following commands at your command prompt:</p>

 <blockquote><pre>

@@ -136,8 +136,8 @@ file:<br />

 <pre style="margin: 1.5em 0 1.5em 2em">

 deb     http://deb.torproject.org/torproject.org <DISTRIBUTION> main

 </pre>

-where you put the codename of your distribution (i.e. lenny, sid,

-saucy or whatever it is)

+where you put the codename of your distribution (i.e. stretch, buster, sid

+or whatever it is)

 in place of <DISTRIBUTION>.

 </p>

@@ -204,8 +204,8 @@ to your <tt>/etc/apt/sources.list</tt> file:<br />

 deb     http://deb.torproject.org/torproject.org <DISTRIBUTION> main

 deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main

 </pre>

-where you again substitute the name of your distro (lenny,

-sid, saucy, ...) in place of

+where you again substitute the name of your distro (stretch, buster,

+sid, xenial, ...) in place of

 <DISTRIBUTION>.

 </p>

@@ -242,7 +242,7 @@ deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

 deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

 deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main

 </pre>

-Substitute the name of your distro (strech, buster, sid, xenial, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root):

+Substitute the name of your distro (stretch, buster, sid, xenial, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root):

 <pre style="margin: 1.5em 0 1.5em 2em">

 apt update

 </pre>

@@ -75,8 +75,9 @@ I run

 <option value="stretch" selected="selected">Debian stable (stretch)</option>

 <option value="buster">Debian testing (buster)</option>

 <option value="sid">Debian unstable (sid)</option>

-<option value="trusty">Ubuntu Trusty Tahr</option>

-<option value="xenial">Ubuntu Xenial Xerus</option>

+<option value="trusty">Ubuntu Trusty Tahr (14.04 LTS)</option>

+<option value="xenial">Ubuntu Xenial Xerus (16.04 LTS)</option>

+<option value="artful">Ubuntu Artful Aardvark (17.10)</option>

 </select>

 and want

 <select id="package"></select>

@@ -77,7 +77,6 @@ I run

 <option value="sid">Debian unstable (sid)</option>

 <option value="trusty">Ubuntu Trusty Tahr</option>

 <option value="xenial">Ubuntu Xenial Xerus</option>

-<option value="zesty">Ubuntu Zesty Zapus</option>

 </select>

 and want

 <select id="package"></select>

@@ -197,7 +197,7 @@ development branch of Tor on Debian or Ubuntu</a></h2>

 <br />

 <p>If you want to use the <a href="<page

-download/download>#packagediff">development branch</a> of Tor instead

+download/download-unix>#packagediff">development branch</a> of Tor instead

 (more features and more bugs), you need to add a different set of lines

 to your <tt>/etc/apt/sources.list</tt> file:<br />

 <pre style="margin: 1.5em 0 1.5em 2em">

@@ -202,7 +202,7 @@ download/download>#packagediff">development branch</a> of Tor instead

 to your <tt>/etc/apt/sources.list</tt> file:<br />

 <pre style="margin: 1.5em 0 1.5em 2em">

 deb     http://deb.torproject.org/torproject.org <DISTRIBUTION> main

-deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main

+deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main

 </pre>

 where you again substitute the name of your distro (lenny,

 sid, saucy, ...) in place of

@@ -240,9 +240,9 @@ deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

 # For the unstable version.

 deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main

+deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main

 </pre>

-Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root):

+Substitute the name of your distro (strech, buster, sid, xenial, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root):

 <pre style="margin: 1.5em 0 1.5em 2em">

 apt update

 </pre>

@@ -73,7 +73,7 @@ I run

 <select id="distrib">

 <option value="jessie">Debian oldstable (jessie)</option>

 <option value="stretch" selected="selected">Debian stable (stretch)</option>

-<option value="testing">Debian testing (buster)</option>

+<option value="buster">Debian testing (buster)</option>

 <option value="sid">Debian unstable (sid)</option>

 <option value="trusty">Ubuntu Trusty Tahr</option>

 <option value="xenial">Ubuntu Xenial Xerus</option>

@@ -75,9 +75,9 @@ I run

 <option value="stretch" selected="selected">Debian stable (stretch)</option>

 <option value="testing">Debian testing (buster)</option>

 <option value="sid">Debian unstable (sid)</option>

-<option value="precise">Ubuntu Precise Pangolin</option>

 <option value="trusty">Ubuntu Trusty Tahr</option>

 <option value="xenial">Ubuntu Xenial Xerus</option>

+<option value="zesty">Ubuntu Zesty Zapus</option>

 </select>

 and want

 <select id="package"></select>

@@ -21,7 +21,7 @@ Debian Buster - testing, or Debian Sid - unstable</a></h2>

 <p>

 If you're using Debian, just run

-</blockquote><pre>  apt-get install tor </pre></blockquote>

+</blockquote><pre>  apt install tor </pre></blockquote>

 as root.

 </p>

@@ -104,10 +104,10 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -

 <div id="apt-get">

 <p>You can install it with the following commands:</p>

-<blockquote><pre>$ apt-get update

-<span id="regular-install">$ apt-get install <span id="apt-package">tor</span> deb.torproject.org-keyring</span>

-<span id="source-install">$ apt-get install build-essential fakeroot devscripts

-$ apt-get build-dep tor deb.torproject.org-keyring</span></pre></blockquote>

+<blockquote><pre>$ apt update

+<span id="regular-install">$ apt install <span id="apt-package">tor</span> deb.torproject.org-keyring</span>

+<span id="source-install">$ apt install build-essential fakeroot devscripts

+$ apt build-dep tor deb.torproject.org-keyring</span></pre></blockquote>

 <div id="source-install2">

 <p>

@@ -115,7 +115,7 @@ Then you can build Tor in ~/debian-packages:

 </p>

 <blockquote><pre>

 $ mkdir ~/debian-packages; cd ~/debian-packages

-$ apt-get source tor

+$ apt source tor

 $ cd tor-*

 $ debuild -rfakeroot -uc -us

 $ cd ..

@@ -151,7 +151,7 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -

 Now refresh your sources, running the following command (as root) at your

 command prompt:

 <pre style="margin: 1.5em 0 1.5em 2em">

-apt-get update

+apt update

 </pre>

 If there are no errors you're good to continue.

 </p>

@@ -160,14 +160,14 @@ If there are no errors you're good to continue.

 We provide a Debian package to help you keep our signing key current.  It is

 recommended you use it.  Install it using

 <pre style="margin: 1.5em 0 1.5em 2em">

-apt-get install deb.torproject.org-keyring

+apt install deb.torproject.org-keyring

 </pre>

 </p>

 <p>

 To finally install Tor just run:

 <pre style="margin: 1.5em 0 1.5em 2em">

-apt-get install tor

+apt install tor

 </pre>

 </p>

@@ -214,8 +214,8 @@ Then run the following commands at your command prompt:

 <pre style="margin: 1.5em 0 1.5em 2em">

 gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89

 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -

-apt-get update

-apt-get install tor deb.torproject.org-keyring

+apt update

+apt install tor deb.torproject.org-keyring

 </pre>

 </p>

@@ -244,18 +244,18 @@ deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DI

 </pre>

 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root):

 <pre style="margin: 1.5em 0 1.5em 2em">

-apt-get update

+apt update

 </pre>

 You also need to install the necessary packages to build your own debs and the

 packages needed to build Tor:

 <pre style="margin: 1.5em 0 1.5em 2em">

-apt-get install build-essential fakeroot devscripts

-apt-get build-dep tor

+apt install build-essential fakeroot devscripts

+apt build-dep tor

 </pre>

 Then you can build Tor in ~/debian-packages:

 <pre style="margin: 1.5em 0 1.5em 2em">

 mkdir ~/debian-packages; cd ~/debian-packages

-apt-get source tor

+apt source tor

 cd tor-*

 debuild -rfakeroot -uc -us

 cd ..

@@ -71,9 +71,9 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T

 <blockquote>

 I run

 <select id="distrib">

-<option value="wheezy">Debian oldstable (jessie)</option>

-<option value="jessie" selected="selected">Debian stable (stretch)</option>

-<option value="stretch">Debian testing (buster)</option>

+<option value="jessie">Debian oldstable (jessie)</option>

+<option value="stretch" selected="selected">Debian stable (stretch)</option>

+<option value="testing">Debian testing (buster)</option>

 <option value="sid">Debian unstable (sid)</option>

 <option value="precise">Ubuntu Precise Pangolin</option>

 <option value="trusty">Ubuntu Trusty Tahr</option>

@@ -89,7 +89,7 @@ version

 <div id="apt-source">

 <p>You need to add the following entry in <code>/etc/apt/sources.list</code> or a new file in <code>/etc/apt/sources.list.d/</code>:</p>

-<blockquote><pre id="sources">deb http://deb.torproject.org/torproject.org wheezy main

+<blockquote><pre id="sources">deb http://deb.torproject.org/torproject.org jessie main

 </pre></blockquote>

 </div>

@@ -71,9 +71,9 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T

 <blockquote>

 I run

 <select id="distrib">

-<option value="wheezy">Debian oldstable (wheezy)</option>

-<option value="jessie" selected="selected">Debian stable (jessie)</option>

-<option value="stretch">Debian testing (stretch)</option>

+<option value="wheezy">Debian oldstable (jessie)</option>

+<option value="jessie" selected="selected">Debian stable (stretch)</option>

+<option value="stretch">Debian testing (buster)</option>

 <option value="sid">Debian unstable (sid)</option>

 <option value="precise">Ubuntu Precise Pangolin</option>

 <option value="trusty">Ubuntu Trusty Tahr</option>

@@ -15,8 +15,8 @@

   </div>

   <div id="maincol">

 <a id="debian"></a>

-<h2><a class="anchor" href="#debian">Option one: Tor on Debian stable,

-Debian sid, or Debian testing</a></h2>

+<h2><a class="anchor" href="#debian">Option one: Tor on Debian Stretch - stable,

+Debian Buster - testing, or Debian Sid - unstable</a></h2>

 <br />

 <p>

@@ -246,7 +246,7 @@ Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DI

 <pre style="margin: 1.5em 0 1.5em 2em">

 apt-get update

 </pre>

-You also need to install the necessary packages to build your own debs and the 

+You also need to install the necessary packages to build your own debs and the

 packages needed to build Tor:

 <pre style="margin: 1.5em 0 1.5em 2em">

 apt-get install build-essential fakeroot devscripts

@@ -282,4 +282,4 @@ instructions.

   <!-- END SIDECOL -->

 </div>

 <!-- END CONTENT -->

-#include <foot.wmi>  

+#include <foot.wmi>

@@ -70,7 +70,7 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T

 <div id="selector" style="display: none;">

 <blockquote>

 I run

-<select id="distrib" onchange="update()">

+<select id="distrib">

 <option value="wheezy">Debian oldstable (wheezy)</option>

 <option value="jessie" selected="selected">Debian stable (jessie)</option>

 <option value="stretch">Debian testing (stretch)</option>

@@ -80,9 +80,9 @@ I run

 <option value="xenial">Ubuntu Xenial Xerus</option>

 </select>

 and want

-<select id="package" onchange="update()"></select>

+<select id="package"></select>

 version

-<select id="version" onchange="update()"></select>

+<select id="version"></select>

 </blockquote>

@@ -3,171 +3,9 @@

 # Translation-Priority: 3-low

 #include "head.wmi" TITLE="Tor Project: Debian/Ubuntu Instructions" CHARSET="UTF-8"

-

-<script>

-<!--

-// This code is based on the http://mozilla.debian.net sources.list

-// generator as originally written by Mike Hommey. It is licensed under

-// the terms of the GNU GPLv2, http://www.gnu.org/licenses/gpl-2.0.html.

-var sources = {};

-var software = {

-'tor': { '_stable': {

-                     'wheezy':  [ 'wheezy' ],

-                     'jessie':  [ 'jessie' ],

-                     'stretch': [ 'stretch' ],

-                     'sid':     [ 'sid' ],

-                     'precise': [ 'precise'],

-                     'trusty':  [ 'trusty'],

-                     'xenial':  [ 'xenial'],

-                     'yakkety': [ 'yakkety'],

-                     },

-         'experimental-0.3.0.x': {

-                     'wheezy':  [ 'wheezy' ],

-                     'jessie':  [ 'jessie' ],

-                     'stretch': [ 'stretch' ],

-                     'sid':     [ 'sid' ],

-                     'precise': [ 'precise'],

-                     'trusty':  [ 'trusty'],

-                     'xenial':  [ 'xenial'],

-                     'yakkety': [ 'yakkety'],

-                     },

-       },

-'tor (from source)': {

-         '_stable': {

-                     'wheezy':  [ 'wheezy' ],

-                     'jessie':  [ 'jessie' ],

-                     'stretch': [ 'stretch' ],

-                     'sid':     [ 'sid' ],

-                     'precise': [ 'precise'],

-                     'trusty':  [ 'trusty'],

-                     'xenial':  [ 'xenial'],

-                     'yakkety': [ 'yakkety'],

-                     },

-         'experimental-0.3.0.x': {

-                     'wheezy':  [ 'wheezy' ],

-                     'jessie':  [ 'jessie' ],

-                     'stretch': [ 'stretch' ],

-                     'sid':     [ 'sid' ],

-                     'precise': [ 'precise'],

-                     'trusty':  [ 'trusty'],

-                     'xenial':  [ 'xenial'],

-                     'yakkety': [ 'yakkety'],

-                     },

-       },

-};

-

-function init() {

-    pkg = document.getElementById('package');

-    for (soft in software) {

-        if (soft != pkg.value) {

-            option = document.createElement('option');

-            option.value = soft;

-            option.appendChild(document.createTextNode(soft.charAt(0).toUpperCase() + soft.slice(1)));

-            pkg.appendChild(option);

-        }

-    }

-

-    apt_get = document.getElementById('apt-get');

-    para = document.createElement('p');

-    para.id = 'sorry';

-    para.style.display = 'none';

-    apt_get.parentNode.insertBefore(para, apt_get);

-    para.appendChild(document.createTextNode("Sorry, this version is not available.\n"));

-

-    document.getElementById('selector').style.display = 'block';

-

-    update();

-}

-

-function replaceText(src, txt) {

-    while (src.firstChild)

-        src.removeChild(src.firstChild);

-    src.appendChild(document.createTextNode(txt));

-}

-

-function update() {

-    pkg = document.getElementById('package');

-    ver = document.getElementById('version');

-    package = pkg.value;

-    version = ver.value;

-    distrib = document.getElementById('distrib').value;

-    if (package != pkg.prev) {

-        while (ver.firstChild)

-            ver.removeChild(ver.firstChild);

-        var selected;

-        for (version in software[package]) {

-            option = document.createElement('option');

-            if (version[0] == '_') {

-                version = version.slice(1);

-                selected = version;

-            }

-            option.appendChild(document.createTextNode(version));

-            option.value = version = version.replace(/ \(.*\)/,'');

-//alert(version);

-            ver.appendChild(option);

-        }

-        ver.value = version = selected || version;

-        pkg.prev = package

-    }

-    try {

-        keys = software[package][version][distrib];

-    } catch (e) {

-        try {

-            keys = software[package]['_' + version][distrib];

-        } catch (e) { };

-    }

-    src = document.getElementById('sources');

-    txt = '';

-    need_signed = false;

-    source_install = false;

-    target = '';

-    for (i = 0; keys && (i < keys.length); i++) {

-//alert(keys[i]);

-        if (keys[i] in sources) {

-            txt += sources[keys[i]];

-            target = keys[i];

-        } else {

-            if (package.slice(-7, -1) == 'source') {

-                package = package.split(' ')[0];

-                source_install = true;

-            }

-            txt += "http://deb.torproject.org/torproject.org";

-            txt += " ";

-            txt += keys[i];

-            txt += " main";

-            need_signed = true;

-            target = keys[i];

-            txt = "deb " + txt + "\ndeb-src " + txt;

-            if (version != 'stable') {

-                txt2 = "http://deb.torproject.org/torproject.org";

-                txt2 += " ";

-                txt2 += package;

-                txt2 += "-";

-                txt2 += version;

-                txt2 += "-";

-                txt2 += keys[i];

-                txt2 += " main";

-                txt = txt + "\ndeb " + txt2 + "\ndeb-src " + txt2;

-            }

-        }

-        txt += "\n";

-    }

-    replaceText(src, txt);

-    document.getElementById('regular-install').style.display = source_install ? 'none' : 'block';

-    document.getElementById('source-install').style.display = source_install ? 'block' : 'none';

-    document.getElementById('source-install2').style.display = source_install ? 'block' : 'none';

-    replaceText(document.getElementById('apt-package'), package);

-    document.getElementById('apt-source').style.display = (keys && keys.length) ? 'block' : 'none';

-    document.getElementById('apt-get').style.display = keys ? 'block' : 'none';

-    document.getElementById('sorry').style.display = keys ? 'none' : 'block';

-}

-

-window.onload = init;

-

-</script>

-

-

+{#meta#:

+<script type="text/javascript" src="debian-selector.js"></script>

+:#meta#}

 <div id="content" class="clearfix">

   <div id="breadcrumbs">

@@ -19,8 +19,9 @@ var software = {

                      'precise': [ 'precise'],

                      'trusty':  [ 'trusty'],

                      'xenial':  [ 'xenial'],

+                     'yakkety': [ 'yakkety'],

                      },

-         'experimental-0.2.9.x': {

+         'experimental-0.3.0.x': {

                      'wheezy':  [ 'wheezy' ],

                      'jessie':  [ 'jessie' ],

                      'stretch': [ 'stretch' ],

@@ -28,6 +29,7 @@ var software = {

                      'precise': [ 'precise'],

                      'trusty':  [ 'trusty'],

                      'xenial':  [ 'xenial'],

+                     'yakkety': [ 'yakkety'],

                      },

        },

 'tor (from source)': {

@@ -39,8 +41,9 @@ var software = {

                      'precise': [ 'precise'],

                      'trusty':  [ 'trusty'],

                      'xenial':  [ 'xenial'],

+                     'yakkety': [ 'yakkety'],

                      },

-         'experimental-0.2.9.x': {

+         'experimental-0.3.0.x': {

                      'wheezy':  [ 'wheezy' ],

                      'jessie':  [ 'jessie' ],

                      'stretch': [ 'stretch' ],

@@ -48,6 +51,7 @@ var software = {

                      'precise': [ 'precise'],

                      'trusty':  [ 'trusty'],

                      'xenial':  [ 'xenial'],

+                     'yakkety': [ 'yakkety'],

                      },

        },

 };

@@ -360,7 +364,7 @@ download/download>#packagediff">development branch</a> of Tor instead

 to your <tt>/etc/apt/sources.list</tt> file:<br />

 <pre style="margin: 1.5em 0 1.5em 2em">

 deb     http://deb.torproject.org/torproject.org <DISTRIBUTION> main

-deb     http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main

+deb     http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main

 </pre>

 where you again substitute the name of your distro (lenny,

 sid, saucy, ...) in place of

@@ -398,7 +402,7 @@ deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

 # For the unstable version.

 deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main

+deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main

 </pre>

 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root):

 <pre style="margin: 1.5em 0 1.5em 2em">

@@ -254,7 +254,7 @@ version

 <div id="sig">

 <p>Then add the gpg key used to sign the packages by running the following commands at your command prompt:</p>

 <blockquote><pre>

-gpg --keyserver keys.gnupg.net --recv 886DDD89

+gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89

 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -

 </pre></blockquote>

 </div>

@@ -303,7 +303,7 @@ in place of <DISTRIBUTION>.

 Then add the gpg key used to sign the packages by running the following

 commands at your command prompt:

 <pre style="margin: 1.5em 0 1.5em 2em">

-gpg --keyserver keys.gnupg.net --recv 886DDD89

+gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89

 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -

 </pre>

 Now refresh your sources, running the following command (as root) at your

@@ -370,7 +370,7 @@ sid, saucy, ...) in place of

 <p>

 Then run the following commands at your command prompt:

 <pre style="margin: 1.5em 0 1.5em 2em">

-gpg --keyserver keys.gnupg.net --recv 886DDD89

+gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89

 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -

 apt-get update

 apt-get install tor deb.torproject.org-keyring

@@ -18,7 +18,6 @@ var software = {

                      'sid':     [ 'sid' ],

                      'precise': [ 'precise'],

                      'trusty':  [ 'trusty'],

-                     'wily':    [ 'wily'],

                      'xenial':  [ 'xenial'],

                      },

          'experimental-0.2.9.x': {

@@ -28,7 +27,6 @@ var software = {

                      'sid':     [ 'sid' ],

                      'precise': [ 'precise'],

                      'trusty':  [ 'trusty'],

-                     'wily':    [ 'wily'],

                      'xenial':  [ 'xenial'],

                      },

        },

@@ -40,7 +38,6 @@ var software = {

                      'sid':     [ 'sid' ],

                      'precise': [ 'precise'],

                      'trusty':  [ 'trusty'],

-                     'wily':    [ 'wily'],

                      'xenial':  [ 'xenial'],

                      },

          'experimental-0.2.9.x': {

@@ -50,7 +47,6 @@ var software = {

                      'sid':     [ 'sid' ],

                      'precise': [ 'precise'],

                      'trusty':  [ 'trusty'],

-                     'wily':    [ 'wily'],

                      'xenial':  [ 'xenial'],

                      },

        },

@@ -239,7 +235,6 @@ I run

 <option value="sid">Debian unstable (sid)</option>

 <option value="precise">Ubuntu Precise Pangolin</option>

 <option value="trusty">Ubuntu Trusty Tahr</option>

-<option value="wily">Ubuntu Wily Werewolf</option>

 <option value="xenial">Ubuntu Xenial Xerus</option>

 </select>

 and want

@@ -21,7 +21,7 @@ var software = {

                      'wily':    [ 'wily'],

                      'xenial':  [ 'xenial'],

                      },

-         'experimental-0.2.8.x': {

+         'experimental-0.2.9.x': {

                      'wheezy':  [ 'wheezy' ],

                      'jessie':  [ 'jessie' ],

                      'stretch': [ 'stretch' ],

@@ -43,7 +43,7 @@ var software = {

                      'wily':    [ 'wily'],

                      'xenial':  [ 'xenial'],

                      },

-         'experimental-0.2.8.x': {

+         'experimental-0.2.9.x': {

                      'wheezy':  [ 'wheezy' ],

                      'jessie':  [ 'jessie' ],

                      'stretch': [ 'stretch' ],

@@ -365,7 +365,7 @@ download/download>#packagediff">development branch</a> of Tor instead

 to your <tt>/etc/apt/sources.list</tt> file:<br />

 <pre style="margin: 1.5em 0 1.5em 2em">

 deb     http://deb.torproject.org/torproject.org <DISTRIBUTION> main

-deb     http://deb.torproject.org/torproject.org tor-experimental-0.2.6.x-<DISTRIBUTION> main

+deb     http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main

 </pre>

 where you again substitute the name of your distro (lenny,

 sid, saucy, ...) in place of

@@ -403,7 +403,7 @@ deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

 # For the unstable version.

 deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main

-deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.6.x-<DISTRIBUTION> main

+deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main

 </pre>

 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root):

 <pre style="margin: 1.5em 0 1.5em 2em">

@@ -233,14 +233,14 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T

 <blockquote>

 I run

 <select id="distrib" onchange="update()">

-<option value="squeeze">Debian oldoldstable (Squeeze)</option>

-<option value="wheezy">Debian oldstable (Wheezy)</option>

-<option value="jessie" selected="selected">Debian (Jessie)</option>

+<option value="wheezy">Debian oldstable (wheezy)</option>

+<option value="jessie" selected="selected">Debian stable (jessie)</option>

+<option value="stretch">Debian testing (stretch)</option>

 <option value="sid">Debian unstable (sid)</option>

-<option value="lucid">Ubuntu Lucid Lynx</option>

 <option value="precise">Ubuntu Precise Pangolin</option>

-<option value="saucy">Ubuntu Saucy Salamander</option>

 <option value="trusty">Ubuntu Trusty Tahr</option>

+<option value="wily">Ubuntu Wily Werewolf</option>

+<option value="xenial">Ubuntu Xenial Xerus</option>

 </select>

 and want

 <select id="package" onchange="update()"></select>

@@ -11,41 +11,48 @@

 // the terms of the GNU GPLv2, http://www.gnu.org/licenses/gpl-2.0.html.

 var sources = {};

 var software = {

-'tor': { '_stable': { 'squeeze': [ 'squeeze' ],

+'tor': { '_stable': {

                      'wheezy':  [ 'wheezy' ],

                      'jessie':  [ 'jessie' ],

                      'stretch': [ 'stretch' ],

                      'sid':     [ 'sid' ],

-                     'lucid':   [ 'lucid'],

                      'precise': [ 'precise'],

-                     'saucy':   [ 'saucy'],

-                     'trusty':  [ 'trusty'], },

-         'experimental-0.2.7.x':    { 'wheezy':  [ 'wheezy' ],

+                     'trusty':  [ 'trusty'],

+                     'wily':    [ 'wily'],

+                     'xenial':  [ 'xenial'],

+                     },

+         'experimental-0.2.8.x': {

+                     'wheezy':  [ 'wheezy' ],

                      'jessie':  [ 'jessie' ],

                      'stretch': [ 'stretch' ],

                      'sid':     [ 'sid' ],

-                     'lucid':   [ 'lucid'],

                      'precise': [ 'precise'],

-                     'saucy':   [ 'saucy'],

-                     'trusty':  [ 'trusty'], },

+                     'trusty':  [ 'trusty'],

+                     'wily':    [ 'wily'],

+                     'xenial':  [ 'xenial'],

+                     },

        },

-'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ],

+'tor (from source)': {

+         '_stable': {

                      'wheezy':  [ 'wheezy' ],

                      'jessie':  [ 'jessie' ],

                      'stretch': [ 'stretch' ],

                      'sid':     [ 'sid' ],

-                     'lucid':   [ 'lucid'],

                      'precise': [ 'precise'],

-                     'saucy':   [ 'saucy'],

-                     'trusty':  [ 'trusty'], },

-         'experimental-0.2.7.x':    { 'wheezy':  [ 'wheezy' ],

+                     'trusty':  [ 'trusty'],

+                     'wily':    [ 'wily'],