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

[webwml/staging] Reorder core people page so it's alphabetical again
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 53ecc1ca9d132848bd06e928e8c6612a620cd0ad Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Feb 6 12:15:57 2016 +0100 Reorder core people page so it's alphabetical again --- about/en/corepeople.wml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 4873932..39fd034 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -26,16 +26,6 @@ <h1>Core Tor People</h1> <dl> - <dt>Shari Steele, Executive Director</dt> - <dd>Shari comes to the Tor Project with more than 22 years - of experience fighting for Internet freedom at the - <a href="https://www.eff.org/">Electronic Frontier - Foundation</a> (EFF), a nonprofit civil liberties - organization working for digital rights. Shari started out - as a staff attorney at EFF and worked her way up to the - executive director job. She currently serves on EFF's board. - </dd> - <dt>Sherief Alaa, Support</dt> <dd>Arabic translator, worked on videos and documentation and helps respond to users who contacted the support desk.</dd> @@ -333,6 +323,15 @@ <dd>Part of the Tor Browser team — develops and maintains Tor Launcher and Torbutton.</dd> + <dt>Shari Steele, Executive Director</dt> + <dd>Shari comes to the Tor Project with more than 22 years + of experience fighting for Internet freedom at the + <a href="https://www.eff.org/">Electronic Frontier + Foundation</a> (EFF), a nonprofit civil liberties + organization working for digital rights. Shari started out + as a staff attorney at EFF and worked her way up to the + executive director job. She currently serves on EFF's board.</dd> + <dt>Dr. Paul Syverson, Researcher</dt> <dd>Inventor of <a href="http://www.onion-router.net/">Onion Routing</a>, original designer of Tor along with Roger and

1 0

[webwml/staging] Remove N900 instructions
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 152760b21b5ca6d7fbb14ec9cdf39ccd7570f07b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 5 21:46:03 2016 +0100 Remove N900 instructions Implements #16605. I think N900s are pretty rare now, and instructions for 0.2.1.x aren't really that useful anymore anyway. --- .gitignore | 1 - docs/en/N900.wml | 191 ------------------------------------------ docs/en/sidenav.wmi | 3 - docs/torbutton/en/sidenav.wmi | 3 - download/en/download.wml | 8 -- 5 files changed, 206 deletions(-) diff --git a/.gitignore b/.gitignore index 1965530..fa0eba6 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ about/sponsors.html.en about/torusers.html.en about/translators.html.en about/volunteers.html.en -docs/N900.html.en docs/android.html.en docs/bridges.html.en docs/debian.html.en diff --git a/docs/en/N900.wml b/docs/en/N900.wml deleted file mode 100644 index c21d36b..0000000 --- a/docs/en/N900.wml +++ /dev/null @@ -1,191 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: N900 Instructions" CHARSET="UTF-8" - - - -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page docs/documentation>">Documentation » </a> - <a href="<page docs/N900>">N900</a> - </div> - <div id="maincol"> - <a id="Maemo"></a> - <h2><a class="anchor" href="#Maemo">Installing Tor on Maemo</a></h2> - <br> - <p> - If you have a Maemo device that is not the <a href="#N900">N900</a>, we - suggest you install the Tor package from the - <a href="http://maemo.org/packages/view/tor/">Maemo website</a>. The Tor - Project does not produce these packages. They are maintained by the - Maemo community. - </p> - - <a id="N900"></a> - <h2><a class="anchor" href="#N900">Installing Tor on the N900</a></h2> - <br> - <p> - The following instructions should help install an - <a href="https://garage.maemo.org/projects/tor-status">experimental - Tor controller</a> and Tor as packaged for the N900 Nokia telephone. This is - currently an untested configuration. The browser in this configuration does - not have Torbutton and it should not be used for high security anonymity needs - at this time. - </p> - - <p> - Open the Application manager: <br> - <a href="$(IMGROOT)/N900/1_app_menu.png"> - <img alt="N900 application menu" - src="$(IMGROOT)/N900/1_app_menu-small.png"/> - </a> - </p> - - <p> - Click on the Application manager menu at the top of the screen: <br> - <a href="$(IMGROOT)/N900/2_app_manager.png"> - <img alt="N900 application manager" - src="$(IMGROOT)/N900/2_app_manager-small.png"/> - </a> - </p> - - <p> - Select 'Application catalogs': <br> - <a href="$(IMGROOT)/N900/3_app_managermenu.png"> - <img alt="N900 application catalogs" - src="$(IMGROOT)/N900/3_app_managermenu-small.png"/> - </a> - </p> - - <p> - Press 'New' to enable the maemo extras-devel repository. <br> - <small>Note: This repository contains untested packages that might harm your - device. <br> - See <a href="http://wiki.maemo.org/Extras-devel">Extras-devel</a> for - details. You should probably disable extras-devel after installing Tor, or - proceed at your own risk.</small> - <br> - <a href="$(IMGROOT)/N900/4_catalog_list.png"> - <img alt="N900 catalog list" - src="$(IMGROOT)/N900/4_catalog_list-small.png"/> - </a> - </p> - - <p> - Enter the following information into the catalog addition screen: - <p> - <pre> - Catalog name: Extras devel - Web address: http://repository.maemo.org/extras-devel/ - Distribution: fremantle - Components: free non-free - </pre> - </p> - <br> - Make sure 'Disabled' is unchecked, hit 'Save', and wait for the package list - to update.<br> - <a href="$(IMGROOT)/N900/5_new_catalog.png"> - <img alt="N900 new catalog" - src="$(IMGROOT)/N900/5_new_catalog-small.png"/> - </a> - </p> - - <p> - Press 'Download' in the App manager: <br> - <a href="$(IMGROOT)/N900/6_app_manager.png"> - <img alt="N900 app manager" - src="$(IMGROOT)/N900/6_app_manager-small.png"/> - </a> - </p> - - <p> - Select the Network category (or search for Tor): <br> - <a href="$(IMGROOT)/N900/7_app_categories.png"> - <img alt="N900 application categories" - src="$(IMGROOT)/N900/7_app_categories-small.png"/> - </a> - </p> - - <p> - Scroll down and select 'Tor Status Area Applet': <br> - <a href="$(IMGROOT)/N900/8_app_list.png"> - <img alt="N900 application list" - src="$(IMGROOT)/N900/8_app_list-small.png"/> - </a> - </p> - - <p> - Agree to the disclaimer and press 'Continue': <br> - <a href="$(IMGROOT)/N900/9_disclaimer.png"> - <img alt="N900 disclaimer" - src="$(IMGROOT)/N900/9_disclaimer-small.png"/> - </a> - </p> - - <p> - When the install is done, disable the extras-devel repository, and reboot - the device: <br> - <a href="$(IMGROOT)/N900/10_success.png"> - <img alt="N900 success" - src="$(IMGROOT)/N900/10_success-small.png"/> - </a> - </p> - - <p> - After rebooting the N900, open the status menu: <br> - <a href="$(IMGROOT)/N900/11_after_rebooting.png"> - <img alt="N900 status menu post-reboot" - src="$(IMGROOT)/N900/11_after_rebooting-small.png"/> - </a> - </p> - - <p> - Select 'The Onion Router' from the list: <br> - <a href="$(IMGROOT)/N900/12_status_menu.png"> - <img alt="N900 status menu selection" - src="$(IMGROOT)/N900/12_status_menu-small.png"/> - </a> - </p> - - <p> - Enable onion routing, and press 'Save': <br> - <a href="$(IMGROOT)/N900/13_enable_tor.png"> - <img alt="N900 enabling Tor" - src="$(IMGROOT)/N900/13_enable_tor-small.png"/> - </a> - </p> - - <p> - Visit <a href="https://check.torproject.org/">TorCheck</a> to confirm that - you are routing browser traffic through Tor: <br> - <a href="$(IMGROOT)/N900/14_check_tor.png"> - <img alt="N900 check Tor" - src="$(IMGROOT)/N900/14_check_tor-small.png"/> - </a> - </p> - - <p> - Note that this might not always give you the latest stable Tor version. - Additionally, the N900 web browser does not have Torbutton. This means that - while it may be useful for circumvention, it probably is unsuitable for strong - web browser anonymity requirements. - </p> - - <hr> - - <p>If you have suggestions for improving this document, please <a - href="<page about/contact>">send them to us</a>. Thanks!</p> - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi index 35a9f36..43ed5ec 100644 --- a/docs/en/sidenav.wmi +++ b/docs/en/sidenav.wmi @@ -42,9 +42,6 @@ {'url' => 'docs/android', 'txt' => 'Installing Tor on Android', }, - {'url' => 'docs/N900', - 'txt' => 'Installing Tor on Maemo/N900', - }, {'url' => 'docs/verifying-signatures', 'txt' => 'Verify our GPG signatures', }], diff --git a/docs/torbutton/en/sidenav.wmi b/docs/torbutton/en/sidenav.wmi index 1b4e3ae..091a349 100644 --- a/docs/torbutton/en/sidenav.wmi +++ b/docs/torbutton/en/sidenav.wmi @@ -39,9 +39,6 @@ {'url' => 'docs/android', 'txt' => 'Installing Tor on Android', }, - {'url' => 'docs/N900', - 'txt' => 'Installing Tor on Maemo/N900', - }, {'url' => 'docs/verifying-signatures', 'txt' => 'Verify our GPG signatures', }], diff --git a/download/en/download.wml b/download/en/download.wml index 77dee1d..92b550f 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -176,14 +176,6 @@ custom configurations. All an apt-get or yum install away.</p> <h2>Android Bundle</h2> <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p> </div> - - <div class="package" style="border-bottom: 0px;"> - <div class="downloads"> - <a class="additional" style="font-weight: bold;" href="<page docs/N900>">Experimental Instructions</a> - </div> - - <h2>Nokia Maemo/N900</h2> - </div> </div>

1 0

[webwml/staging] Remove unused version entries
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit e351883ab3d9d77bde8dac0add3074f8ff5209b3 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 5 22:05:42 2016 +0100 Remove unused version entries --- include/versions.wmi | 40 ---------------------------------------- wml2po.sh | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 65b77ac..cb81326 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -3,55 +3,20 @@ <define-tag version-win32-stable whitespace=delete>0.2.7.6</define-tag> -<define-tag version-win32-bundle-stable whitespace=delete>0.2.4.23</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.23</define-tag> - -<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.4.20</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.20</define-tag> - -<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.17-rc</define-tag> - -<define-tag version-osx-x86-stable whitespace=delete>0.2.4.20</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.18-rc</define-tag> - -<define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> - <define-tag version-torbrowserbundledir whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a1</define-tag> <define-tag version-torbrowserbundle whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>6.0a1</define-tag> -<define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> -<define-tag version-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> -<define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> -<define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> -<define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a1</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a1</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> -<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a1</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> -<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> - -<define-tag version-androidbundle-tor whitespace=delete>0.2.3.10-alpha</define-tag> -<define-tag version-androidbundle-orbot whitespace=delete>1.0.7-FINAL</define-tag> -<define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag> -<define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> -<define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> @@ -60,8 +25,3 @@ <define-tag file-source-alpha whitespace=delete>tor-<version-alpha>.tar.gz</define-tag> <define-tag package-source-alpha whitespace=delete>../dist/<file-source-alpha></define-tag> -<define-tag version-torbutton whitespace=delete>1.4.6.3 (10 Oct 2012)</define-tag> -<define-tag version-hash-torbutton whitespace=delete>sha1:968455a5b702b3cabb6c16499e531a5a8f4c5f21</define-tag> - -<define-tag version-torbutton-alpha whitespace=delete>None</define-tag> -<define-tag version-hash-torbutton-alpha whitespace=delete>sha1:c7323cd408ebee28ee23b6a91fe056d59de668f5</define-tag> diff --git a/wml2po.sh b/wml2po.sh index 796398b..84059e6 100755 --- a/wml2po.sh +++ b/wml2po.sh @@ -32,7 +32,7 @@ copyright="The Tor Project, Inc" # in website/include/versions.wmi. Tags that people usually forget to close, # as well as tags that are not defined in versions.wmi, have been added. # See: https://svn.torproject.org/svn/website/trunk/include/versions.wmi -customtag=`echo $(cat "$wmldir/include/versions.wmi" | awk '{ printf "<%s> " , $2 }' | sed 's/<>//g') "<svnsandbox> <svnwebsite> <svnprojects> <input> <hr> <br> <img> <gitblob> <package-androidbundle-alpha> <version-androidbundle-tor> <video controls> <wiki>"` +customtag=`echo $(cat "$wmldir/include/versions.wmi" | awk '{ printf "<%s> " , $2 }' | sed 's/<>//g') "<svnsandbox> <svnwebsite> <svnprojects> <input> <hr> <br> <img> <gitblob> <video controls> <wiki>"` # We also need to use the nodefault option of po4a; space separated list # of tags that the module should not try to set by default in any

1 0

[webwml/staging] Merge remote-tracking branch 'asn/web_hs_page_riseup_guide'
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 25d4b9ceafb2478e36990841a78d87a1c6a07b6b Merge: 53ecc1c 65ecaeb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 7 03:00:03 2016 +0100 Merge remote-tracking branch 'asn/web_hs_page_riseup_guide' docs/en/tor-hidden-service.wml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

1 0

[webwml/staging] Update activity column
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 840ea7a4825a0269191f1c0faf663860a8b8beb7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 13 18:41:54 2016 -0800 Update activity column Just a quick refresh after looking at everything's commit activity. Also dropping a dead metrics link. --- getinvolved/en/volunteer.wml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index c0f0873..e260318 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -160,7 +160,7 @@ meetings around the world.</li> <td><a href="#project-nyx">Nyx</a></td> <td>User Interface</td> <td>Python, Curses</td> - <td>Light</td> + <td>Heavy</td> <td>atagar</td> </tr> @@ -208,7 +208,7 @@ meetings around the world.</li> <td><a href="#project-obfsproxy">Obfsproxy</a></td> <td>Client Add-on</td> <td>Python</td> - <td>Light</td> + <td>None</td> <td>asn</td> </tr> @@ -240,7 +240,7 @@ meetings around the world.</li> <td><a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> - <td>Moderate</td> + <td>Heavy</td> <td>atagar</td> </tr> @@ -256,7 +256,7 @@ meetings around the world.</li> <td><a href="#project-tlsdate">Tlsdate</a></td> <td>Utility</td> <td>C</td> - <td>Light</td> + <td>None</td> <td>ioerror</td> </tr> @@ -264,7 +264,7 @@ meetings around the world.</li> <td><a href="#project-metrics">Metrics</a></td> <td>Client Service</td> <td>Java</td> - <td>Light</td> + <td>Moderate</td> <td>karsten</td> </tr> @@ -304,7 +304,7 @@ meetings around the world.</li> <td><a href="#project-exitmap">ExitMap</a></td> <td>Backend Service</td> <td>Python</td> - <td>Moderate</td> + <td>Light</td> <td>phw</td> </tr> @@ -312,7 +312,7 @@ meetings around the world.</li> <td><a href="#project-doctor">DocTor</a></td> <td>Backend Service</td> <td>Python</td> - <td>None</td> + <td>Light</td> <td>atagar</td> </tr> @@ -328,8 +328,8 @@ meetings around the world.</li> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> - <td>None</td> - <td>kaner</td> + <td>Light</td> + <td>ilv</td> </tr> <tr> @@ -344,7 +344,7 @@ meetings around the world.</li> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> - <td>Heavy</td> + <td>Light</td> <td>isis</td> </tr> @@ -352,7 +352,7 @@ meetings around the world.</li> <td><a href="#project-ooni-probe">Ooni Probe</a></td> <td>Scanner</td> <td>Python</td> - <td>Light</td> + <td>Moderate</td> <td>hellais, aagbsn</td> </tr> @@ -384,7 +384,7 @@ meetings around the world.</li> <td><a href="#project-tor2web">Tor2web</a></td> <td>Client Service</td> <td>Python</td> - <td>Light</td> + <td>Heavy</td> <td>evilaliv3, hellais</td> </tr> @@ -395,7 +395,6 @@ meetings around the world.</li> <td>Light</td> <td>arma, nickm</td> </tr> - </table> <sub> @@ -631,7 +630,6 @@ meetings around the world.</li> <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 - href="https://gitweb.torproject.org/metrics-utils.git">utils</a>, <a href="https://gitweb.torproject.org/metrics-web.git">web</a>)</h3> <p>

1 0

[webwml/staging] Link to correct tor browser changelog
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 50764d0ae45ae7ad23ed6cf7d957112054470b74 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 5 22:10:03 2016 +0100 Link to correct tor browser changelog Fixes #16751 --- include/versions.wmi | 1 + projects/en/torbrowser.wml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index cb81326..4c98ace 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -3,6 +3,7 @@ <define-tag version-win32-stable whitespace=delete>0.2.7.6</define-tag> +<define-tag version-torbrowserdevelopbranch whitespace=delete>maint-5.5</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a1</define-tag> diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index f7811dc..3e0f757 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -662,8 +662,8 @@ <a href="https://www.torproject.org/projects/torbrowser/design/">design document</a>, the <a - href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-D…">ChangeLog - for the 4.0 branch</a>, and the <a + href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-D…<version-torbrowserdevelopbranch>">ChangeLog + for the branch <version-torbrowserdevelopbranch></a>, and the <a href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-D…">ChangeLog for the alpha branch</a>. </p>

1 0

[webwml/staging] Add new Tor Browser version
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 47c7af4a53eab2af3cac8a5d01ece053a39b7101 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 12 13:53:45 2016 +0000 Add new Tor Browser version --- include/versions.wmi | 12 ++++++------ projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 4c98ace..3f59644 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -4,19 +4,19 @@ <define-tag version-win32-stable whitespace=delete>0.2.7.6</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-5.5</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>5.5.1</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.5.2</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a1</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>5.5.1</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.5.2</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>6.0a1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.1</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.1</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.2</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a1</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.1</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.1</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.2</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.2</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a1</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 6756af7..8c69bf4 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,6 +7,10 @@ "5.5.1-Linux", "5.5.1-MacOS", "5.5.1-Windows", +"5.5.2", +"5.5.2-Linux", +"5.5.2-MacOS", +"5.5.2-Windows", "6.0a1", "6.0a1-Linux", "6.0a1-MacOS",

1 0

[webwml/staging] Remove unused N900 images
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit a8574518c141a738ea2b29ed096cb3f824f8268c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 7 18:17:51 2016 +0100 Remove unused N900 images --- images/N900/10_success-small.png | Bin 226409 -> 0 bytes images/N900/10_success.png | Bin 174213 -> 0 bytes images/N900/11_after_rebooting-small.png | Bin 52131 -> 0 bytes images/N900/11_after_rebooting.png | Bin 43976 -> 0 bytes images/N900/12_status_menu-small.png | Bin 122210 -> 0 bytes images/N900/12_status_menu.png | Bin 99049 -> 0 bytes images/N900/13_enable_tor-small.png | Bin 92249 -> 0 bytes images/N900/13_enable_tor.png | Bin 70965 -> 0 bytes images/N900/14_check_tor-small.png | Bin 76880 -> 0 bytes images/N900/14_check_tor.png | Bin 49637 -> 0 bytes images/N900/1_app_menu-small.png | Bin 262268 -> 0 bytes images/N900/1_app_menu.png | Bin 297204 -> 0 bytes images/N900/2_app_manager-small.png | Bin 187985 -> 0 bytes images/N900/2_app_manager.png | Bin 242688 -> 0 bytes images/N900/3_app_managermenu-small.png | Bin 144670 -> 0 bytes images/N900/3_app_managermenu.png | Bin 108576 -> 0 bytes images/N900/4_catalog_list-small.png | Bin 67683 -> 0 bytes images/N900/4_catalog_list.png | Bin 55933 -> 0 bytes images/N900/5_new_catalog-small.png | Bin 104907 -> 0 bytes images/N900/5_new_catalog.png | Bin 75177 -> 0 bytes images/N900/6_app_manager-small.png | Bin 187392 -> 0 bytes images/N900/6_app_manager.png | Bin 241880 -> 0 bytes images/N900/7_app_categories-small.png | Bin 137320 -> 0 bytes images/N900/7_app_categories.png | Bin 116193 -> 0 bytes images/N900/8_app_list-small.png | Bin 98294 -> 0 bytes images/N900/8_app_list.png | Bin 72474 -> 0 bytes images/N900/9_disclaimer-small.png | Bin 139479 -> 0 bytes images/N900/9_disclaimer.png | Bin 84438 -> 0 bytes 28 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/N900/10_success-small.png b/images/N900/10_success-small.png deleted file mode 100644 index 2841a68..0000000 Binary files a/images/N900/10_success-small.png and /dev/null differ diff --git a/images/N900/10_success.png b/images/N900/10_success.png deleted file mode 100644 index e7d5662..0000000 Binary files a/images/N900/10_success.png and /dev/null differ diff --git a/images/N900/11_after_rebooting-small.png b/images/N900/11_after_rebooting-small.png deleted file mode 100644 index 1990169..0000000 Binary files a/images/N900/11_after_rebooting-small.png and /dev/null differ diff --git a/images/N900/11_after_rebooting.png b/images/N900/11_after_rebooting.png deleted file mode 100644 index f86965a..0000000 Binary files a/images/N900/11_after_rebooting.png and /dev/null differ diff --git a/images/N900/12_status_menu-small.png b/images/N900/12_status_menu-small.png deleted file mode 100644 index 27c0307..0000000 Binary files a/images/N900/12_status_menu-small.png and /dev/null differ diff --git a/images/N900/12_status_menu.png b/images/N900/12_status_menu.png deleted file mode 100644 index 1ee95b3..0000000 Binary files a/images/N900/12_status_menu.png and /dev/null differ diff --git a/images/N900/13_enable_tor-small.png b/images/N900/13_enable_tor-small.png deleted file mode 100644 index e116e58..0000000 Binary files a/images/N900/13_enable_tor-small.png and /dev/null differ diff --git a/images/N900/13_enable_tor.png b/images/N900/13_enable_tor.png deleted file mode 100644 index d45b10f..0000000 Binary files a/images/N900/13_enable_tor.png and /dev/null differ diff --git a/images/N900/14_check_tor-small.png b/images/N900/14_check_tor-small.png deleted file mode 100644 index 59e57fd..0000000 Binary files a/images/N900/14_check_tor-small.png and /dev/null differ diff --git a/images/N900/14_check_tor.png b/images/N900/14_check_tor.png deleted file mode 100644 index f1b8838..0000000 Binary files a/images/N900/14_check_tor.png and /dev/null differ diff --git a/images/N900/1_app_menu-small.png b/images/N900/1_app_menu-small.png deleted file mode 100644 index 4bcd48e..0000000 Binary files a/images/N900/1_app_menu-small.png and /dev/null differ diff --git a/images/N900/1_app_menu.png b/images/N900/1_app_menu.png deleted file mode 100644 index 4df6677..0000000 Binary files a/images/N900/1_app_menu.png and /dev/null differ diff --git a/images/N900/2_app_manager-small.png b/images/N900/2_app_manager-small.png deleted file mode 100644 index 3a6b8a2..0000000 Binary files a/images/N900/2_app_manager-small.png and /dev/null differ diff --git a/images/N900/2_app_manager.png b/images/N900/2_app_manager.png deleted file mode 100644 index 2914138..0000000 Binary files a/images/N900/2_app_manager.png and /dev/null differ diff --git a/images/N900/3_app_managermenu-small.png b/images/N900/3_app_managermenu-small.png deleted file mode 100644 index 2c673b2..0000000 Binary files a/images/N900/3_app_managermenu-small.png and /dev/null differ diff --git a/images/N900/3_app_managermenu.png b/images/N900/3_app_managermenu.png deleted file mode 100644 index 59156d4..0000000 Binary files a/images/N900/3_app_managermenu.png and /dev/null differ diff --git a/images/N900/4_catalog_list-small.png b/images/N900/4_catalog_list-small.png deleted file mode 100644 index d8c2082..0000000 Binary files a/images/N900/4_catalog_list-small.png and /dev/null differ diff --git a/images/N900/4_catalog_list.png b/images/N900/4_catalog_list.png deleted file mode 100644 index fc8f86a..0000000 Binary files a/images/N900/4_catalog_list.png and /dev/null differ diff --git a/images/N900/5_new_catalog-small.png b/images/N900/5_new_catalog-small.png deleted file mode 100644 index 7f1f18e..0000000 Binary files a/images/N900/5_new_catalog-small.png and /dev/null differ diff --git a/images/N900/5_new_catalog.png b/images/N900/5_new_catalog.png deleted file mode 100644 index 0aafaa2..0000000 Binary files a/images/N900/5_new_catalog.png and /dev/null differ diff --git a/images/N900/6_app_manager-small.png b/images/N900/6_app_manager-small.png deleted file mode 100644 index b287f51..0000000 Binary files a/images/N900/6_app_manager-small.png and /dev/null differ diff --git a/images/N900/6_app_manager.png b/images/N900/6_app_manager.png deleted file mode 100644 index 203b033..0000000 Binary files a/images/N900/6_app_manager.png and /dev/null differ diff --git a/images/N900/7_app_categories-small.png b/images/N900/7_app_categories-small.png deleted file mode 100644 index 4f82e44..0000000 Binary files a/images/N900/7_app_categories-small.png and /dev/null differ diff --git a/images/N900/7_app_categories.png b/images/N900/7_app_categories.png deleted file mode 100644 index f07c2c1..0000000 Binary files a/images/N900/7_app_categories.png and /dev/null differ diff --git a/images/N900/8_app_list-small.png b/images/N900/8_app_list-small.png deleted file mode 100644 index dd69363..0000000 Binary files a/images/N900/8_app_list-small.png and /dev/null differ diff --git a/images/N900/8_app_list.png b/images/N900/8_app_list.png deleted file mode 100644 index e8db31e..0000000 Binary files a/images/N900/8_app_list.png and /dev/null differ diff --git a/images/N900/9_disclaimer-small.png b/images/N900/9_disclaimer-small.png deleted file mode 100644 index af9d8e4..0000000 Binary files a/images/N900/9_disclaimer-small.png and /dev/null differ diff --git a/images/N900/9_disclaimer.png b/images/N900/9_disclaimer.png deleted file mode 100644 index 1241f0b..0000000 Binary files a/images/N900/9_disclaimer.png and /dev/null differ

1 0

[webwml/staging] Don't rely on people.tpo for the website
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 5a4e0c03f9afdee80d9d0cc2cb818842ada7bc2e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 7 03:17:20 2016 +0100 Don't rely on people.tpo for the website --- press/en/video.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/press/en/video.wml b/press/en/video.wml index 62dc4d3..77251e2 100644 --- a/press/en/video.wml +++ b/press/en/video.wml @@ -27,7 +27,7 @@ <video width="500" height="281" controls preload="none" poster="$(IMGROOT)/tor-animation.jpg"> <source src="https://media.torproject.org/video/2015-03-animation/HQ/Tor_Animation_en.we…" type="video/webm"> - <track label="English" kind="captions" src="https://people.torproject.org/~nima/03-2015-Tor-Animation/subs/vtt/en.vtt" srclang="en" default> + <track label="English" kind="captions" src="https://media.torproject.org/video/2015-03-animation/subs/vtt/en.vtt" srclang="en" default> </video> </div>

1 0

[webwml/staging] update gsoc page for 2016
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit fedc193b8102e1790a409e10c2b93754a3de96dc Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Feb 19 13:08:38 2016 -0500 update gsoc page for 2016 --- about/en/gsoc.wml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/about/en/gsoc.wml b/about/en/gsoc.wml index b8f4e25..7d77410 100644 --- a/about/en/gsoc.wml +++ b/about/en/gsoc.wml @@ -2,29 +2,29 @@ # Revision: $Revision$ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Google Summer of Code 2015" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor: Google Summer of Code 2016" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> <a href="<page about/gsoc>">Google Summer of Code</a> </div> <div id="maincol"> - <h2>Tor: Google Summer of Code 2015</h2> + <h2>Tor: Google Summer of Code 2016</h2> <hr> - <h3>IMPORTANT NOTE: Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC 2015. Hopefully we'll be back next year, but in the meantime we're running our own program: <a href="https://trac.torproject.org/projects/tor/wiki/org/TorSoP">the Summer of Privacy</a>!</h3> - <br /><br /> <p> The Tor Project, in collaboration with <a href="https://www.eff.org/">The Electronic Frontier Foundation</a>, have taken part in Google Summer of Code for 2007 through 2014, mentoring the total of 53 students. + In 2015, Tor <a href="https://lists.torproject.org/pipermail/tor-dev/2015-March/008358.html">was not accepted</a> into GSoC (along with many other established organizations). Instead we ran our own program that summer: +<a href="https://trac.torproject.org/projects/tor/wiki/org/TorSoP">the Summer of Privacy</a>!  </p>

1 0