February 2015 - tor-commits - lists.torproject.org

[webwml/staging] Always show deb-src entry on debian page
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 29adba25b34fa662c3231331d31efeeb1117bf45 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 18:43:19 2015 +0100 Always show deb-src entry on debian page --- docs/en/debian.wml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index a167cd1..7e1fa2f 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -122,13 +122,11 @@ function update() { txt += sources[keys[i]]; target = keys[i]; } else { - txt += "deb"; if (package.slice(-7, -1) == 'source') { - txt += '-src'; package = package.split(' ')[0]; - source_install = true + source_install = true; } - txt += " http://deb.torproject.org/torproject.org"; + txt += "http://deb.torproject.org/torproject.org"; txt += " "; if (version != 'stable') { txt += package; @@ -140,15 +138,14 @@ function update() { txt += " main"; need_signed = true; target = keys[i]; + txt = "deb " + txt + "\ndeb-src " + txt; } txt += "\n"; } replaceText(src, txt); - //document.getElementById('signed').style.display = need_signed ? 'block' : 'none'; 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-target'), (keys && keys.length && target != distrib && target != distrib + '-security') ? ' -t ' + target : ''); 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';

1 0

[webwml/staging] reorder stable and experimental on debian selector
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit d6e25bbf368eadfac24c74c6e78972819a821cab Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:08:54 2015 +0100 reorder stable and experimental on debian selector --- docs/en/debian.wml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 5503438..9869735 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -11,7 +11,7 @@ // the terms of the GNU GPLv2, http://www.gnu.org/licenses/gpl-2.0.html. var sources = {}; var software = { -'tor': { 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], +'tor': { 'stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -20,7 +20,7 @@ var software = { 'saucy': [ 'saucy'], 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, - 'stable': { 'squeeze': [ 'squeeze' ], + 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -30,7 +30,7 @@ var software = { 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, }, -'tor (from source)': { 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], +'tor (from source)': { 'stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -39,7 +39,7 @@ var software = { 'saucy': [ 'saucy'], 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, - 'stable': { 'squeeze': [ 'squeeze' ], + 'experimental-0.2.6.x': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -89,19 +89,16 @@ function update() { 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 {

1 0

[webwml/staging] Deeplink to obfs3 bridges
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 155df4a464cb226bf858c98c1a54eeef14f875e1 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:03:32 2015 +0100 Deeplink to obfs3 bridges --- projects/en/obfsproxy.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/en/obfsproxy.wml b/projects/en/obfsproxy.wml index 0a56458..44ffd94 100644 --- a/projects/en/obfsproxy.wml +++ b/projects/en/obfsproxy.wml @@ -61,7 +61,7 @@ <a id="morebridges"></a> <h2><a class="anchor" href="#morebridges">Looking for obfsproxy bridges?</a></h2> <p> - <a href="https://bridges.torproject.org/?transport=obfs2">You can use BridgeDB to get obfsproxy bridges.</a> + <a href="https://bridges.torproject.org/bridges?transport=obfs3">You can use BridgeDB to get obfsproxy bridges.</a> </p>

1 0

[webwml/staging] Try to fit form fields in one line on debian page
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 186abc678e644e1bb448e711769102fb2817b6a2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 18:47:54 2015 +0100 Try to fit form fields in one line on debian page --- docs/en/debian.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index c1e33d6..9042ef3 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -226,7 +226,7 @@ For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#T <div id="selector" style="display: none;"> <blockquote> -I'm running +I run <select id="distrib" onchange="update()"> <option value="squeeze">Debian oldstable (Squeeze)</option> <option value="wheezy" selected="selected">Debian stable (Wheezy)</option> @@ -238,7 +238,7 @@ I'm running <option value="trusty">Ubuntu Trusty Tahr</option> <option value="utopic">Ubuntu Utopic Unicorn</option> </select> -and installing +and want <select id="package" onchange="update()"></select> version <select id="version" onchange="update()"></select>

1 0

[webwml/staging] Remove reference to BSD packages
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 31e848b224a1bfb254c0b536c3f553a19055b69b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 18:49:17 2015 +0100 Remove reference to BSD packages --- docs/en/tor-doc-unix.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/tor-doc-unix.wml b/docs/en/tor-doc-unix.wml index d50e8b7..aceaa72 100644 --- a/docs/en/tor-doc-unix.wml +++ b/docs/en/tor-doc-unix.wml @@ -27,7 +27,7 @@ <p> The latest release of Tor can be found on the <a href="<page download/download>">download</a> page. We have packages for Debian, - Red Hat, Gentoo, *BSD, etc there too. If you're + Red Hat, Gentoo, etc there too. If you're using Ubuntu, don't use the default packages: use <a href="<page docs/debian>#ubuntu">our deb repository</a> instead. Similarly, CentOS / Fedora users should use <a href="<page

1 0

[webwml/staging] underscore means default. ouch
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 7cd8071c909d5b365f19a2042c39abef90050d02 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:16:03 2015 +0100 underscore means default. ouch --- docs/en/debian.wml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 9869735..95c93ea 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -11,7 +11,7 @@ // 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': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -30,7 +30,7 @@ var software = { 'trusty': [ 'trusty'], 'utopic': [ 'utopic'] }, }, -'tor (from source)': { 'stable': { 'squeeze': [ 'squeeze' ], +'tor (from source)': { '_stable': { 'squeeze': [ 'squeeze' ], 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'sid': [ 'sid' ], @@ -89,16 +89,19 @@ function update() { 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 {

1 0

[webwml/staging] Update bandwidth requirements
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 35be4c37b22e95ee879e9ed0509c9ed0bb02a63b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:45:56 2015 +0100 Update bandwidth requirements --- docs/en/faq.wml | 2 +- docs/en/tor-doc-relay.wml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index c946740..3883def 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -2295,7 +2295,7 @@ too. BandwidthRate is the maximum long-term bandwidth allowed (bytes per second). For example, you might want to choose "BandwidthRate 10 MBytes" for 10 megabytes per second (a fast connection), or "BandwidthRate 500 - KBytes" for 500 kilobytes per second (a pretty good cable connection). + KBytes" for 500 kilobytes per second (a decent cable connection). The minimum BandwidthRate setting is 20 kilobytes per second. </li> <li> diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml index 7d48782..e2053bf 100644 --- a/docs/en/tor-doc-relay.wml +++ b/docs/en/tor-doc-relay.wml @@ -18,12 +18,12 @@ <p> The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 250 kilobytes/s each way, please help out Tor by configuring your - Tor to be a relay too. + at least 2 megabits/s for both upload and download, please help out + Tor by configuring your Tor to be a relay too. </p> <p>You can run a Tor relay on pretty much any operating system. Tor relays - work best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and + work best on Linux, OS X Lion or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later. </p>

1 0

[webwml/staging] Merge branch 'staging'
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit a913f039edaa066fa30b05b50246ff5d945e73ce Merge: c147121 6bfcba9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 18:32:04 2015 +0100 Merge branch 'staging' docs/en/debian.wml | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 231 insertions(+), 7 deletions(-)

1 0

[webwml/staging] Added missing hr and s/GPG/GnuPG/
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 931eb98293943c1e26f1c3160e57ef288527cb37 Author: ilv <ilv(a)users.noreply.github.com> Date: Wed Feb 11 17:00:23 2015 -0300 Added missing hr and s/GPG/GnuPG/ --- docs/en/verifying-signatures.wml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index 5396bba..d4bc169 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -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">

1 0

[webwml/staging] Combined osx and linux instructions
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit d63f66894a2cbe021267491610885a717047bd5a Author: ilv <ilv(a)users.noreply.github.com> Date: Wed Feb 11 16:56:33 2015 -0300 Combined osx and linux instructions --- docs/en/verifying-signatures.wml | 51 ++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index 430e5e8..5396bba 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -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> - <pre>gpg --verify ~/Desktop/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg{.asc*,}</pre> + <strong>For Mac OS X users</strong>: + <pre>gpg --verify ~/Desktop/TorBrowser-<version>-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> <p>The output should say "Good signature": </p> @@ -158,30 +165,20 @@ to the developer. The best method is to meet the developer in person and exchange key fingerprints. </p> - - <h3>Linux</h3> - <hr> - - <p>Most Linux distributions come with gpg preinstalled, so users - who want to verify the Tor Browser for Linux (or the source - tarball) can just follow along with the instructions above for - "Mac OS X". </p> - - <p>If you're using the <b>Debian</b> Tor (not Tor Browser) packages, you - should read the - instructions on <a href="<page docs/debian>#packages">importing - these keys to apt</a>.</p> - - <p>If you're using the <b>RPMs</b> (for Tor, not Tor Browser), you can - manually verify the - signatures on the RPM packages by <pre>rpm -K filename.rpm</pre></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 + href="<page docs/debian>#packages">importing these keys to apt</a>. + If you're using the <b>RPMs</b> (for Tor, not Tor Browser), you can + manually verify the signatures on the RPM packages by + <pre>rpm -K filename.rpm</pre> + </p> <p>See <a href="http://www.gnupg.org/documentation/">http://www.gnupg.org/documentation/</a> to learn more about GPG.</p> - <hr> - <a id="BuildVerification"></a> <h3><a class="anchor" href="#BuildVerification"> Verifying sha256sums (advanced)</a></h3>

1 0