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

[webwml/staging] Replace non-breaking space with normal space
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit bb10520f7d54da9a0f824bd0346848e88e9d4b62 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 12:38:19 2015 +0100 Replace non-breaking space with normal space --- projects/en/torbrowser.wml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 99e80ed..4f97dce 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -37,7 +37,7 @@ Tor Browser </a> Installation Instructions - <a href="#windows">Windows</a> • <a href="#macosx">OS X</a> • <a href="#linux">Linux</a> + <a href="#windows">Windows</a> • <a href="#macosx">Mac OS X</a> • <a href="#linux">Linux</a> </div> <!-- Commenting out the videos until support updates them to use TB 4.0 <div class="pjvids"> @@ -51,7 +51,7 @@ <td><a href="https://media.torproject.org/video/TBBTraining/TBBTraining-DownloadAndVerif…"> Windows</a></td> <td><a href="https://media.torproject.org/video/TBBTraining/TBBTraining-DownloadAndVerif…"> - Apple OS X</a></td> + Mac OS X</a></td> <td><a href="https://media.torproject.org/video/TBBTraining/TBBTraining-DownloadAndVerif…"> Linux</a></td> </tr> @@ -82,7 +82,7 @@ <tr> <th> Language</th> <th>Microsoft Windows (<version-torbrowserbundle>)</th> - <th>Mac OS X (<version-torbrowserbundleosx32>)</th> + <th>Mac OS X (<version-torbrowserbundleosx32>)</th> <th>Linux (<version-torbrowserbundlelinux32>)</th> </tr> </thead> @@ -304,7 +304,7 @@ <tr> <th> Language</th> <th>Microsoft Windows (<version-torbrowserbundlebeta>)</th> - <th>Mac OS X (<version-torbrowserbundleosx64beta>)</th> + <th>Mac OS X (<version-torbrowserbundleosx64beta>)</th> <th>Linux (<version-torbrowserbundlelinux32beta>)</th> </tr> </thead> @@ -513,7 +513,7 @@ <div id="macosx" class="anchor"></div> <div class="macosx box"> - <div class="pjtitle"><h2>Mac OS X Instructions</h2></div> + <div class="pjtitle"><h2>Mac OS X Instructions</h2></div> <div class="pjtext"> Download the file above, save it somewhere, then click on it. This opens the .dmg file. (On recent versions of OS X, you might get

1 0

[webwml/staging] People like spelling it OS X
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit ecaa2485a9bcf32e1a0bb56905b58a01432789fa Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 12:41:26 2015 +0100 People like spelling it OS X --- docs/en/faq.wml | 4 ++-- docs/torbutton/en/design/design.xml | 4 ++-- docs/torbutton/en/design/index.html.en | 4 ++-- download/en/download.wml | 4 ++-- projects/en/gettor.wml | 2 +- projects/torbrowser/design/index.html.en | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index be15a45..c946740 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -1050,7 +1050,7 @@ and send an email to '<tt>gettor(a)torproject.org</tt>' with one of the following words in the body of the message: <tt>windows</tt>, <tt>osx</tt> or <tt>linux</tt> (case insensitive). You will receive a reply with links from popular cloud services to -download Tor Browser for Windows, Mac OSX or Linux, depending on the +download Tor Browser for Windows, Mac OS X or Linux, depending on the option you chose. Currently, the only cloud service supported is Dropbox. If you send a blank message or anything different from the options mentioned, you will receive a help message with detailed @@ -2443,7 +2443,7 @@ too. may be torrc.client and torrc.relay.</li> <li>Modify the Tor client and relay startup scripts to include '-f /path/to/correct/torrc'.</li> - <li>In Linux/BSD/OSX, changing the startup scripts to Tor.client + <li>In Linux/BSD/Mac OS X, changing the startup scripts to Tor.client and Tor.relay may make separation of configs easier.</li> </ul> diff --git a/docs/torbutton/en/design/design.xml b/docs/torbutton/en/design/design.xml index 588d6f4..d50f267 100644 --- a/docs/torbutton/en/design/design.xml +++ b/docs/torbutton/en/design/design.xml @@ -244,8 +244,8 @@ Browser window resolution information provides something like information contributes about another factor of 5 (for about 5 resolutions in typical use). In addition, the dimensions and position of the desktop taskbar are available, which can reveal hints on OS information. This boosts the count -by a factor of 5 (for each of the major desktop taskbars - Windows, OSX, KDE -and Gnome, and None). Subtracting the browser content window +by a factor of 5 (for each of the major desktop taskbars - Windows, Mac +OS X, KDE and Gnome, and None). Subtracting the browser content window size from the browser outer window size provide yet more information. Firefox toolbar presence gives about a factor of 8 (3 toolbars on/off give 2<superscript>3</superscript>=8). Interface effects such as title bar font size diff --git a/docs/torbutton/en/design/index.html.en b/docs/torbutton/en/design/index.html.en index 4a6efd0..82ecd64 100644 --- a/docs/torbutton/en/design/index.html.en +++ b/docs/torbutton/en/design/index.html.en @@ -148,8 +148,8 @@ Browser window resolution information provides something like information contributes about another factor of 5 (for about 5 resolutions in typical use). In addition, the dimensions and position of the desktop taskbar are available, which can reveal hints on OS information. This boosts the count -by a factor of 5 (for each of the major desktop taskbars - Windows, OSX, KDE -and Gnome, and None). Subtracting the browser content window +by a factor of 5 (for each of the major desktop taskbars - Windows, Mac +OS X, KDE and Gnome, and None). Subtracting the browser content window size from the browser outer window size provide yet more information. Firefox toolbar presence gives about a factor of 8 (3 toolbars on/off give 23=8). Interface effects such as title bar font size diff --git a/download/en/download.wml b/download/en/download.wml index f9490e2..d5b7f7a 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -90,7 +90,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg.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> -# Comment out until 64-bit OSX bundles are available again +# Comment out until 64-bit Mac OS X bundles are available again # <a class="button osx-tbb64" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip">Download<button-osx-tbb64></a> # <select name="language" id="osx-tbb64" class="lang"> @@ -98,7 +98,7 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo # </select> # <div class="sig"> # <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a> -#<!-- OSX 64. -EC +#<!-- Mac OS X 64. -EC # (<a class="osx-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> # </div> # <a href="<page projects/torbrowser-details>#build">Source Code</a> diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml index 67fd9fb..4a5d6fd 100644 --- a/projects/en/gettor.wml +++ b/projects/en/gettor.wml @@ -32,7 +32,7 @@ one of the following options in the body of the message: </li> <li>linux: If the user needs Tor Browser for Linux. </li> - <li>osx: If the user needs Tor Browser for Mac OSX. + <li>osx: If the user needs Tor Browser for Mac OS X. </li> </ul> diff --git a/projects/torbrowser/design/index.html.en b/projects/torbrowser/design/index.html.en index 1bd9530..e063944 100644 --- a/projects/torbrowser/design/index.html.en +++ b/projects/torbrowser/design/index.html.en @@ -1206,7 +1206,7 @@ details such as screen orientation or type. We patch Firefox to <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commitdiff/30dc2c4290698af81c…" target="_top">report a fixed set of system colors to content window CSS</a>, and <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commitdiff/8f6e979d30598569de…" target="_top">prevent -detection of font smoothing on OSX</a>. We also always +detection of font smoothing on Mac OS X</a>. We also always <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commitdiff/09561f0e5452305b9e…" target="_top">report landscape-primary</a> for the screen orientation. @@ -1831,4 +1831,4 @@ not directly provide the link sharing capabilities that Web-Send does, it is a better solution to the privacy issues associated with federated login than Web-Send is. - </li></ol></div></div></div></div></body></html> \ No newline at end of file + </li></ol></div></div></div></div></body></html>

1 0

[webwml/staging] Drop the 'Help improve Tor sandboxing' project idea
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 577f98c3804df4cf65e95d5c577e91cd685fabff Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 11 08:14:01 2015 -0800 Drop the 'Help improve Tor sandboxing' project idea Nick and David both say this is done. --- getinvolved/en/volunteer.wml | 68 +----------------------------------------- 1 file changed, 1 insertion(+), 67 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index ab1b164..514bf2d 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -405,8 +405,7 @@ meetings around the world.</li> <a href="#improveTorTestCoverage">Improve test coverage in Tor</a> <a href="#useMoreCores">Have the Tor daemon use more cores</a> <a href="#improveHiddenServices">Help improve Tor hidden services</a> - <a href="#improvedDnsSupport">Improved DNS support for Tor</a> - <a href="#torSandboxing">Help improve Tor sandboxing</a> + <a href="#improvedDnsSupport">Improved DNS support for Tor</a> <a id="project-torbrowser"></a> @@ -1433,71 +1432,6 @@ the codebase that you want to work on. </li> - <a id="torSandboxing"></a> - <li> - Help improve Tor sandboxing - - Effort Level: Medium - - Skill Level: Medium - - Likely Mentors: David (dgoulet) - -The seccomp2 mechanism on Linux lets programs improve their robustness -against unforseen bugs by running with restrictions on which system -calls they can invoke and how they can call them. This can help -security a lot. - - - -Thanks to a GSOC student from last year, we now have seccomp2 support on -Linux, which we use to restrict the capabilities of the entire Tor -process. (For implementation details, see src/commmon/sandbox.c in the -Tor source.) - - - -But since the restrictions are done over the whole process, all pieces -of the Tor code have permission to do things that only small parts of -the Tor program need to do. Also, since we use seccomp2, these -restrictions only work on Linux. - - - -It would be great to instead divide the main Tor program into multiple -processes with a robust IPC mechanism and assign each process its own -minimal set of privileges; and to have this work (as best we can) on -systems that don't have seccomp2 (eg Windows, Mac). - - - -Either of these could be a whole GSOC project. - - - -To get started, make sure you understand the existing sandboxing code. -If you're interested in splitting Tor into multiple processes, think -about the architecture, and think about how we could reach this -architecture without completely rewriting the codebase. (Remember that -even if you're focusing on Linux, Tor still needs to work on other -operating systems.) - - - -If you're interested in supporting more platforms, make sure you -understand and can explain what sandboxing mechansisms you want to use, -and what they're capable of. (You might want to investigate the way -that other open-source programs, like the Chrome web browser, do their -sandboxing on different platforms.) - - - -As part of the application process for this project, please contribute a -nontrivial patch to Tor -- ideally, one that will affect some part of -the codebase that you want to work on. - - </li> - <a id="panopticlick"></a> <li> Panopticlick

1 0

[webwml/staging] Adding Juha to the volunteer page
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit c147121147bc0aef5fed45d1bb6f17b08cb127e1 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 11 08:34:23 2015 -0800 Adding Juha to the volunteer page Speaking of GSoC students who have stuck around, Juha has. --- about/en/volunteers.wml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/about/en/volunteers.wml b/about/en/volunteers.wml index 4a44794..2e96e10 100644 --- a/about/en/volunteers.wml +++ b/about/en/volunteers.wml @@ -24,6 +24,9 @@ question about Tor.</dd> technology.</dd> <dt>Fabian Keil</dt><dd>One of the core Privoxy developers, and also a Tor fan. He's the reason Tor and Privoxy still work well together.</dd> +<dt>Juha Nurmi</dt><dd>GSoC sudent in 2014 and author behind <a +href="https://blog.torproject.org/category/tags/ahmiafi">Ahmia</a>, a search +engine for hidden services.</dd> <dt>Julius Mittenzwei</dt><dd>A lawyer with the CCC in Germany. Coordinates the German Tor community with respect to legal questions and concerns.</dd>

1 0

[webwml/staging] Adding project idea "Ahmia - Hidden Service Search"
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit f471f7e42ce49e7333ec7673082e81ed63d93b94 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 11 08:30:17 2015 -0800 Adding project idea "Ahmia - Hidden Service Search" Project Juha and George would like to mentor. --- getinvolved/en/volunteer.wml | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 02aa220..0a1dd52 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -1490,6 +1490,63 @@ implementation. </li> + <a id="ahmiaSearch"></a> + <li> + Ahmia - Hidden Service Search + + Effort Level: Medium + + Skill Level: Medium + + Likely Mentors: Juha Nurmi (numes), George (asn) + +Ahmia is open-source search engine software for Tor hidden service deep dark web sites. You can test the running search engine at ahmia.fi. For more information see our <a href="https://blog.torproject.org/category/tags/ahmiafi">blog post about Ahmia's GSoC2014 development</a>. + + + +Ahmia is a working search engine that indexes, searches, and catalogs content published on Tor Hidden Services. Furthermore, it is an environment to share meaningful insights, statistics, insights, and news about the Tor network itself. In this context, there is a lot of work to do. + + + +The Ahmia web service is written using the Django web framework. As a result, the server-side language is Python. On the client-side, most of the pages are plain HTML. There are some pages that require JavaScript, but the search itself works without client-side JavaScript. + + + +There are several possible directions for this project, including... + + + <ol> + <li>Improving the search results (very important) + <ul> + <li>Tweaking search algorithms</li> + <li>Adjust Apache Solr</li> + <li>Enrich the data that is used to rank the search results</li> + </ul> + </li> + <li>Improving UX and UI (very important) + <ul> + <li>Showing relevant knowledge</li> + <li>Design the navigation and information architecture</li> + <li>HTML5, CSS and Django development</li> + </ul> + </li> + <li>Review code and infrastructure + <ul> + <li>Review code and fix bugs</li> + <li>Writing Django test cases</li> + <li>Linux configurations, automatizations</li> + </ul> + </li> + <li>Gather statistics over time and publish them + <ul> + <li>Gather different kind of stats about Hidden Services</li> + <li>Publish these stats using HTTP REST API</li> + <li>Using this API show meaningful tables, charts and visualizations</li> + </ul> + </li> + </ol> + + </li> <!-- <a id="improveStegotorus"></a> <li>

1 0

[webwml/staging] Adding Nick back to the tor project ideas
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 66f59001904c2e11c0b6bceb5d08161a5de4c934 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 11 08:15:23 2015 -0800 Adding Nick back to the tor project ideas Nick's indicated he'd be happy to mentor so adding him back. --- getinvolved/en/volunteer.wml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 514bf2d..02aa220 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -924,7 +924,7 @@ meetings around the world.</li> Skill Level: Medium to High - Likely Mentors: David (dgoulet) + Likely Mentors: Nick (nickm), David (dgoulet) The Tor code is more than 10 years old in places, and we haven't always had enough time or wisdom to write things as well as we could have. Our unit @@ -1251,7 +1251,7 @@ configurations is a good first step to understanding this problem. Skill Level: Medium - Likely Mentors: David (dgoulet) + Likely Mentors: Nick (nickm), David (dgoulet) Right now, our unit test coverage with the tests we ship is around 30% -- only 30% of the executable lines in our source are reached by the @@ -1317,7 +1317,7 @@ easy to test.) Skill Level: Medium - Likely Mentors: David (dgoulet) + Likely Mentors: Nick (nickm), David (dgoulet) Right now, if you run a busy Tor server on a multicore computer, most of the cores are mostly unused. We have a "cpuworker" mechanism to move @@ -1367,7 +1367,7 @@ the codebase that you want to work on. Skill Level: Medium - Likely Mentors: David (dgoulet), George (asn) + Likely Mentors: Nick (nickm), David (dgoulet), George (asn) We're working on a revamp of the entire Tor hidden service design to improve the security and reliability of the hidden service system. @@ -1404,7 +1404,7 @@ the codebase that you want to work on. Skill Level: Medium - Likely Mentors: David (dgoulet) + Likely Mentors: Nick (nickm), David (dgoulet) Right now, you can only use Tor's DNS support to look up IPv4 and IPv6 addresses, and to fetch PTR records. But DNS can do so much more!

1 0

[webwml/staging] Dropping GSoC students from the volunteer page
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit e41cfc05128d7b7f05ce10d197ccdcc4f1227a5c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 11 08:31:05 2015 -0800 Dropping GSoC students from the volunteer page This listing is out of date and they're already listed on... https://trac.torproject.org/projects/tor/wiki/doc/gsoc We should only add folks here when they've stuck around. Most students don't, but on the occasion we get a long-term contributor happy to add 'em. --- about/en/volunteers.wml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/about/en/volunteers.wml b/about/en/volunteers.wml index 9dac33e..4a44794 100644 --- a/about/en/volunteers.wml +++ b/about/en/volunteers.wml @@ -12,21 +12,6 @@ <div id="maincol"> <h1>Volunteers</h1> <dl> -<dt>Google Summer of Code, 2012</dt><dd> -Brandon Wiley - <a href="http://stepthreeprivacy.org/">Python Pluggable Transports</a> -Feroze Naina - <a href="http://feroze.in/gsoc12.html">Hidden Service Configuration</a> -Michele Orrù - APAF -Ravi Padmala - <a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a> -vmon - Stegotorus</dd> - -<dt>Google Summer of Code, 2011</dt><dd> -Brandon Wiley - <a href="http://stepthreeprivacy.org/">Blocking-resistant Transport Evaluation Framework</a> -asn - <a href="https://gitorious.org/obfsproxy/pages/Home">Pluggable transports</a> -Julien Voisin - <a href="https://mat.boum.org/">Metadata Anonymisation Toolkit</a> -Kamran Khan - <a href="http://code.inspirated.com/">GTK+ Frontend and Client Mode Improvements for arm</a> -Max - <a href="https://tails.boum.org/todo/TailsGreeter/blog/">Custom GDM3 startup menu, aka. tails-greeter</a> -Sathyanarayanan Gunasekaran - <a href="http://gsathya.in/blog/">GSoC : Orbot + ORLib</a></dd> - <dt>Anonym, bertagaz, and intrigeri</dt><dd>Maintainers of <a href="https://tails.boum.org/">The Amnesic Incognito Live System</a>.</dd> <dt>Marco Bonetti</dt><dd>Focusing on MobileTor for the iPhone.</dd>

1 0

[webwml/staging] Show stable entry along with experimental for debian
by sebastian＠torproject.org 12 Feb '15

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

12 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/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