November 2016 - tor-commits - lists.torproject.org

[webwml/staging] Bumping expert bundle to 0.2.8.7
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 0659413b9dcb2679a5dc560c432984950cb24727 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 16 15:07:28 2016 +0000 Bumping expert bundle to 0.2.8.7 --- include/versions.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/versions.wmi b/include/versions.wmi index 12d510d..36e7003 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,7 +1,7 @@ <define-tag version-stable whitespace=delete>0.2.8.7</define-tag> <define-tag version-alpha whitespace=delete>0.2.9.2-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.8.6</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.8.7</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.0</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>6.0.5</define-tag>

1 0

[webwml/staging] Deprecate old Tor Browser versions
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 5419339cef6bd1dd9b252fb4e20d91bdc604ef5e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Sep 18 19:19:19 2016 +0200 Deprecate old Tor Browser versions --- projects/torbrowser/RecommendedTBBVersions | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 3f9813f..2b7ff7c 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,12 +1,4 @@ [ -"6.0.3", -"6.0.3-Linux", -"6.0.3-MacOS", -"6.0.3-Windows", -"6.0.4", -"6.0.4-Linux", -"6.0.4-MacOS", -"6.0.4-Windows", "6.0.5", "6.0.5-Linux", "6.0.5-MacOS",

1 0

[webwml/staging] Add new Tor Browser version (6.0.4)
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit bd613b40c51e63d0d33b611dee6a99a8d06ba914 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 16 08:55:53 2016 +0000 Add new Tor Browser version (6.0.4) --- include/versions.wmi | 14 +++++++------- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 10339a0..46ec6c0 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,29 +1,29 @@ <define-tag version-stable whitespace=delete>0.2.8.6</define-tag> <define-tag version-alpha whitespace=delete>0.2.9.1-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.7.6</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.8.6</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.0</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>6.0.3</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>6.0.4</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a2</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>6.0.3</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>6.0.4</define-tag> <define-tag releasedate-torbrowserbundle whitespace=delete>2016-08-02</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>6.5a2</define-tag> <define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-08-03</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>6.0.3</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>6.0.4</define-tag> <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-08-02</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>6.0.3</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>6.0.4</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-08-02</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a2</define-tag> <define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-08-03</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a2</define-tag> <define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-08-03</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>6.0.3</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>6.0.4</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-08-02</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>6.0.3</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>6.0.4</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-08-02</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a2</define-tag> <define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-08-03</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 7f3b902..9fd109e 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "6.0.3-Linux", "6.0.3-MacOS", "6.0.3-Windows", +"6.0.4", +"6.0.4-Linux", +"6.0.4-MacOS", +"6.0.4-Windows", "6.5a2", "6.5a2-Linux", "6.5a2-MacOS",

1 0

[webwml/staging] Update projects on the volunteer page.
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit aca2257a0d25efa10a68a1525a9062c3e11effa7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 11 17:26:29 2016 +0200 Update projects on the volunteer page. --- getinvolved/en/volunteer.wml | 80 +++++++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 20 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 20f7190..3e12459 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -124,7 +124,7 @@ meetings around the world.</li> <td>Core</td> <td>C</td> <td>Heavy</td> - <td>nickm, athena, arma</td> + <td>nickm, athena, arma, dgoulet, asn, teor</td> </tr> <tr> @@ -132,7 +132,7 @@ meetings around the world.</li> <td>Bundle</td> <td>Javascript, XUL, Scripting</td> <td>Heavy</td> - <td>mikeperry, Pearl Crescent</td> + <td>mikeperry, Pearl Crescent, GeKo</td> </tr> <tr> @@ -155,7 +155,7 @@ meetings around the world.</li> <td><a href="#project-orbot">Orbot</a></td> <td>User Interface</td> <td>Java</td> - <td>Moderage</td> + <td>Moderate</td> <td>n8fr8</td> </tr> @@ -260,15 +260,15 @@ meetings around the world.</li> <td>Client Service</td> <td>Java</td> <td>Moderate</td> - <td>karsten</td> + <td>karsten, iwakeh</td> </tr> <tr> <td><a href="#project-atlas">Atlas</a></td> <td>Client Service</td> <td>JavaScript</td> - <td>None</td> - <td></td> + <td>Moderate</td> + <td>irl</td> </tr> <tr> @@ -283,8 +283,8 @@ meetings around the world.</li> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java</td> - <td>Light</td> - <td>karsten</td> + <td>Heavy</td> + <td>karsten, iwakeh</td> </tr> <tr> @@ -304,14 +304,6 @@ meetings around the world.</li> </tr> <tr> - <td><a href="#project-weather">Weather</a></td> - <td>Client Service</td> - <td>Python</td> - <td>None</td> - <td>kaner</td> - </tr> - - <tr> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -374,6 +366,30 @@ meetings around the world.</li> <td>Light</td> <td>arma, nickm</td> </tr> + + <tr> + <td><a href="#project-collector">CollecTor</a></td> + <td>Backend Service</td> + <td>Java</td> + <td>Heavy</td> + <td>karsten, iwakeh</td> + </tr> + + <tr> + <td><a href="#project-metrics-lib">metrics-lib</a></td> + <td>Library</td> + <td>Java</td> + <td>Heavy</td> + <td>karsten, iwakeh</td> + </tr> + + <tr> + <td><a href="#project-exonerator">ExoneraTor</a></td> + <td>Client Service</td> + <td>Java</td> + <td>Light</td> + <td>karsten, iwakeh</td> + </tr> </table> <sub> @@ -602,15 +618,13 @@ meetings around the world.</li> </p> <a id="project-metrics"></a> - <h3><a href="https://metrics.torproject.org/">Metrics</a> (code: <a - href="https://gitweb.torproject.org/metrics-db.git">db</a>, <a + <h3><a href="https://metrics.torproject.org/">Metrics</a> (<a href="https://gitweb.torproject.org/metrics-web.git">web</a>)</h3> <p> Processing and analytics of consensus data, provided to users via the metrics portal. This has been under active development for several years by - Karsten Loesing. See also <a - href="https://gitweb.torproject.org/torperf.git">TorPerf</a>. + Karsten Loesing. </p> <a id="project-atlas"></a> @@ -788,6 +802,32 @@ meetings around the world.</li> we're missing any important papers, please let us know! </p> + <a id="project-collector"></a> + <h3><a href="https://collector.torproject.org/">CollecTor</a> + (<a href="https://gitweb.torproject.org/collector.git">code</a>, + <a href="https://trac.torproject.org/projects/tor/query?status=!closed&component=Met…">bug tracker</a>)</h3> + + <p>CollecTor is the Tor network data archive that powers other + services like <a href="#project-metrics">Metrics</a> and + <a href="#project-onionoo">Onionoo</a>.</p> + + <a id="project-metrics-lib"></a> + <h3>metrics-lib + (<a href="https://gitweb.torproject.org/metrics-lib.git">code</a>, + <a href="https://trac.torproject.org/projects/tor/query?status=!closed&component=Met…">bug tracker</a>)</h3> + + <p>metrics-lib is a Java library that processes Tor network data + provided by <a href="#project-collector">CollecTor</a> or from other + sources.</p> + + <a id="project-exonerator"></a> + <h3><a href="https://exonerator.torproject.org/">ExoneraTor</a> + (<a href="https://gitweb.torproject.org/exonerator.git">code</a>, + <a href="https://trac.torproject.org/projects/tor/query?status=!closed&component=Met…">bug tracker</a>)</h3> + + <p>ExoneraTor is a service that answers the question whether there was + a Tor relay running on a given IP address on a given date.</p> + <a id="Coding"></a> <a id="Summer"></a> <h2><a class="anchor" href="#Coding">Project Ideas</a></h2>

1 0

[webwml/staging] Two more blog url fixes
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit e233c2811c1e6b12e21190013a8fdc51ef40e4ee Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 23 06:24:06 2016 +0200 Two more blog url fixes --- docs/en/faq-abuse.wml | 2 +- docs/en/faq.wml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/faq-abuse.wml b/docs/en/faq-abuse.wml index 17b810f..76d3db3 100644 --- a/docs/en/faq-abuse.wml +++ b/docs/en/faq-abuse.wml @@ -164,7 +164,7 @@ using technology?</a></li> types, see <a href="<wiki>doc/TorAbuseTemplates">the collection of templates on the Tor wiki</a>. You can also proactively reduce the amount of abuse you - get by following <a href="<blog>running-exit-node">these tips + get by following <a href="<blog>tips-running-exit-node">these tips for running an exit node with minimal harassment</a> and <a href="<wiki>doc/ReducedExitPolicy">running a reduced exit policy</a>.</p> diff --git a/docs/en/faq.wml b/docs/en/faq.wml index abf47de..301b6a4 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -2366,7 +2366,7 @@ on <a href="<page docs/faq-abuse>#TypicalAbuses">issues you might encounter</a> if you use the default exit policy, and then read Mike Perry's - <a href="<blog>running-exit-node">tips + <a href="<blog>tips-running-exit-node">tips for running an exit node with minimal harassment</a>. </p>

1 0

[webwml/staging] Add new Tor Browser versions: 6.5a3, 6.5a3-hardened
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 9345ce0de83a7dcbd0ee155deb2c5937e1c39045 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 20 22:38:51 2016 +0200 Add new Tor Browser versions: 6.5a3, 6.5a3-hardened --- include/versions.wmi | 18 +++++++++--------- projects/torbrowser/RecommendedTBBVersions | 8 +++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 36e7003..f4ee828 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,28 +5,28 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.0</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>6.0.5</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a2</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a3</define-tag> <define-tag version-torbrowserbundle whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundle whitespace=delete>2016-09-16</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a2</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-08-03</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a3</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-09-20</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-09-16</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-09-16</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-08-03</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-08-03</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-09-20</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-09-20</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-09-16</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>6.0.5</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-09-16</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a2</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-08-03</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a3</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-09-20</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 2b7ff7c..c3b6794 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -8,5 +8,11 @@ "6.5a2-MacOS", "6.5a2-Windows", "6.5a2-hardened", -"6.5a2-hardened-Linux" +"6.5a2-hardened-Linux", +"6.5a3", +"6.5a3-Linux", +"6.5a3-MacOS", +"6.5a3-Windows", +"6.5a3-hardened", +"6.5a3-hardened-Linux" ]

1 0

[webwml/staging] Fix broken blog link (thanks dmr)
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit ff3ba9097697cd6e260697073628d14d2144c2da Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 23 06:19:02 2016 +0200 Fix broken blog link (thanks dmr) *shakes fist angrily at people editing blog titles* --- eff/en/tor-legal-faq.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eff/en/tor-legal-faq.wml b/eff/en/tor-legal-faq.wml index 16ac0af..09d265a 100644 --- a/eff/en/tor-legal-faq.wml +++ b/eff/en/tor-legal-faq.wml @@ -107,7 +107,7 @@ you. These relays do not directly forward traffic to the Internet and so can't be easily mistaken for the origin of allegedly unlawful content.</p> <p>The Tor Project's blog has some excellent <a -href="https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment">recommendations</a> +href="https://blog.torproject.org/blog/tips-running-exit-node">recommendations</a> for running an exit with as little risk as possible. We suggest that you review their advice before setting up an exit relay.</p> @@ -146,7 +146,7 @@ responsible for the content. This could mean the difference between having your computer seized by law enforcement and being left alone.</p> <p>The Tor Project <a -href="https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment">suggests</a> +href="https://blog.torproject.org/blog/tips-running-exit-node">suggests</a> the following ways to let others know that you're running an exit relay:</p>

1 0

[webwml/staging] Update debian packge with 0.2.9-experimental
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 3c84d62498f289083b36e229f88e4cdc0c3e9bdb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 23 01:45:06 2016 +0200 Update debian packge with 0.2.9-experimental --- docs/en/debian.wml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 5f0581d..de91aaa 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -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">

1 0

[webwml/staging] tor doesn't "install" or "put" the torrc file
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit ff56397380b77b9d4e0e22d67dbb1324a6bd0d91 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Aug 24 01:09:27 2016 -0400 tor doesn't "install" or "put" the torrc file humans (or packages) do. --- docs/en/faq.wml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index c238ca6..abf47de 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -1523,7 +1523,7 @@ href="http://www.crowdstrike.com/community-tools/index.html#tool-79">proposed What does that mean?</a></h3> <p> -Tor installs a text file called torrc that contains configuration +Tor uses a text file called torrc that contains configuration instructions for how your Tor program should behave. The default configuration should work fine for most Tor users. </p> @@ -1536,11 +1536,11 @@ and select "Show Package Contents" before the Tor Browser directories become visible. </p> <p> -Tor puts the torrc file in <code>/usr/local/etc/tor/torrc</code> if you compiled tor from source, and <code>/etc/tor/torrc</code> or <code>/etc/torrc</code> if you installed a pre-built package.</p> +Tor looks for the torrc file in <code>/usr/local/etc/tor/torrc</code> if you compiled tor from source, and <code>/etc/tor/torrc</code> or <code>/etc/torrc</code> if you installed a pre-built package.</p> <p> -Once you've changed your torrc, you will need to restart tor for the -changes to take effect. (For advanced users, note that +Once you've created or changed your torrc file, you will need to restart +tor for the changes to take effect. (For advanced users, note that you actually only need to send Tor a HUP signal, not actually restart it.) </p>

1 0

[webwml/staging] Prefer 64bit on Linux
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 76e5bbfbf51dc0b6a52ccfff118ffb4750f58078 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Aug 17 09:06:10 2016 +0200 Prefer 64bit on Linux --- download/en/download-easy.wml | 34 +++++++++++++++++----------------- download/en/download.wml | 23 ++++++++++++----------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 4bb1517..c740b78 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -76,44 +76,44 @@ <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p> </div> </div> - - <div id="linux" class="easy linux"> + + <div class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser for Linux</h2> - <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /> - <a href="<page projects/torbrowser>">Learn more »</a></p> + <h2>Tor Browser for Linux (64-Bit)</h2> + <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> </div> <form class="downloads"> - <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> - <select name="language" id="lin-tbb32" class="lang"> + <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> + <select name="language" id="lin-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> - (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p> </div> </div> - - <div class="easy linux"> + + <div id="linux" class="easy linux"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="desc"> - <h2>Tor Browser for 64-Bit Linux</h2> - <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> + <h2>Tor Browser for Linux (32-Bit)</h2> + <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /> + <a href="<page projects/torbrowser>">Learn more »</a></p> </div> <form class="downloads"> - <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> - <select name="language" id="lin-tbb64" class="lang"> + <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> + <select name="language" id="lin-tbb32" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> - (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p> diff --git a/download/en/download.wml b/download/en/download.wml index 0f3550a..571c7f8 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -14,8 +14,8 @@ <define-tag button-win-tbb64>Currently Unused</define-tag> <define-tag button-osx-tbb32>Tor Browser</define-tag> # -<define-tag button-lin-tbb32>Tor Browser</define-tag> -<define-tag button-lin-tbb64>64-bit</define-tag> +<define-tag button-lin-tbb32>Tor Browser (32-Bit)</define-tag> +<define-tag button-lin-tbb64>Tor Browser (64-Bit)</define-tag> #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" @@ -121,26 +121,27 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo # <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> - <select name="language" id="lin-tbb32" class="lang"> + <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> + <select name="language" id="lin-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> - (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - + <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br /> + - <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> - <select name="language" id="lin-tbb64" class="lang"> + <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> + <select name="language" id="lin-tbb32" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> - (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br /> - + + </form> <h2>Tor Browser</h2>

1 0