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

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

11 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/master] Deeplink to obfs3 bridges
by sebastian＠torproject.org 11 Feb '15

11 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/master] sid is unstable
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit 44cb188803173b8d321f0a6a3565f1d9b3b4fac6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 19:01:52 2015 +0100 sid is unstable --- docs/en/debian.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 9042ef3..5503438 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -231,7 +231,7 @@ I run <option value="squeeze">Debian oldstable (Squeeze)</option> <option value="wheezy" selected="selected">Debian stable (Wheezy)</option> <option value="jessie">Debian testing (Jessie)</option> -<option value="sid">Debian sid</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>

1 0

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

11 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/master] Try to fit form fields in one line on debian page
by sebastian＠torproject.org 11 Feb '15

11 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/master] Show stable entry along with experimental for debian
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit d671689fe4123abf1a609c05c0bed9b2398ad3cd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 18:46:22 2015 +0100 Show stable entry along with experimental for debian --- docs/en/debian.wml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 7e1fa2f..c1e33d6 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -128,17 +128,22 @@ function update() { } txt += "http://deb.torproject.org/torproject.org"; txt += " "; - if (version != 'stable') { - txt += package; - txt += "-"; - txt += version; - 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"; }

1 0

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

11 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/master] Always show deb-src entry on debian page
by sebastian＠torproject.org 11 Feb '15

11 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/master] Update Debian page to include js sources.list selector
by sebastian＠torproject.org 11 Feb '15

11 Feb '15

commit 6bfcba96f0a969b23f2b2713873ed93d0277b47f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 12:04:15 2015 +0100 Update Debian page to include js sources.list selector Implements ticket 3985 --- docs/en/debian.wml | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 231 insertions(+), 7 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 425d7fd..a167cd1 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -3,6 +3,165 @@ # Translation-Priority: 3-low #include "head.wmi" TITLE="Tor Project: Debian/Ubuntu Instructions" CHARSET="UTF-8" + +<script> + +</script> + + + <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> @@ -16,8 +175,8 @@ Debian sid, or Debian testing</a></h2> <br /> <p> -If you're using Debian, just run<br /> -<tt>apt-get install tor</tt> +If you're using Debian, just run +</blockquote><pre> apt-get install tor </pre></blockquote> as root. </p> @@ -61,7 +220,73 @@ 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>. For Ubuntu, ask <a href="https://en.wikipedia.org/wiki/List_of_Ubuntu_releases#Table_of_versions">Wikipedia</a>. +</p> + +<div id="selector" style="display: none;"> +<blockquote> +I'm running +<select id="distrib" onchange="update()"> +<option value="squeeze">Debian oldstable (Squeeze)</option> +<option value="wheezy" selected="selected">Debian stable (Wheezy)</option> +<option value="jessie">Debian testing (Jessie)</option> +<option value="sid">Debian 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="utopic">Ubuntu Utopic Unicorn</option> +</select> +and installing +<select id="package" onchange="update()"></select> +version +<select id="version" onchange="update()"></select> +</blockquote> + + +<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 +</pre></blockquote> +</div> +<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 --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - +</pre></blockquote> +</div> + + +<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> + +<div id="source-install2"> +<p> +Then you can build Tor in ~/debian-packages: +</p> +<blockquote><pre> +$ mkdir ~/debian-packages; cd ~/debian-packages +$ apt-get source tor +$ cd tor-* +$ debuild -rfakeroot -uc -us +$ cd .. +</pre></blockquote> +<p>Now you can install the new package:</p> +<blockquote><pre> +$ sudo dpkg -i tor_*.deb +</pre></blockquote> +</div> +</div> +</div> + +<noscript> +<p> Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br /> @@ -103,12 +328,15 @@ apt-get install tor </pre> </p> +</noscript> + <p> Now Tor is installed and running. Move on to <a href="<page docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions. </p> +<noscript> <p style="font-size: small"> The DNS name <code>deb.torproject.org</code> is actually a set of independent servers in a DNS round robin configuration. If you for some reason cannot @@ -200,11 +428,7 @@ Now Tor is installed and running. Move on to <a href="<page docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions. </p> - -<hr /> - -<p>If you have suggestions for improving this document, please <a -href="<page about/contact>">send them to us</a>. Thanks!</p> +</noscript>  </div>

1 0

[stem/master] Print which tor executable is used in run_tests
by atagar＠torproject.org 11 Feb '15

11 Feb '15

commit 2b89278f0d3ff771a88626e46be135f9ac78562c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Feb 10 07:55:26 2015 +0100 Print which tor executable is used in run_tests --- test/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runner.py b/test/runner.py index 9019eae..0dfe434 100644 --- a/test/runner.py +++ b/test/runner.py @@ -705,7 +705,7 @@ class Runner(object): :raises: OSError if we either fail to create the tor process or reached a timeout without success """ - println('Starting tor...\n', STATUS) + println('Starting %s...\n' % tor_cmd, STATUS) start_time = time.time() try:

1 0