October 2014 - tor-commits - lists.torproject.org

[webwml/staging] Merge branch 'master' into staging
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit c4f7d23bd16e47db0c7b4fca7640556c6c50bb8d Merge: 7ea8c12 5f76c46 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Oct 28 09:49:12 2014 +0100 Merge branch 'master' into staging en/index.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[webwml/master] band-aid so the website doesn't look as broken
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit 5f76c4694e87ff2ebb574fded1526f508e74396e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Oct 28 09:33:44 2014 +0100 band-aid so the website doesn't look as broken --- en/index.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/en/index.wml b/en/index.wml index 8bacbf2..bc5acf5 100644 --- a/en/index.wml +++ b/en/index.wml @@ -57,7 +57,8 @@ --> <td> <div class="project"> - <a href="https://tails.boum.org/"><img + <a href="https://tails.boum.org/"><img width="75" + height="75" src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> <h3><a href="https://tails.boum.org/">Tails</a></h3> <p>Live CD/USB operating system preconfigured to use

1 0

[webwml/staging] apparently apache cannot handle comments on non-empty lines
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit c61eac7c0a82390118312d890021cb76ccde10ff Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 22 22:40:13 2014 -0400 apparently apache cannot handle comments on non-empty lines --- docs/en/running-a-mirror.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en/running-a-mirror.wml b/docs/en/running-a-mirror.wml index ee903fb..39a3430 100644 --- a/docs/en/running-a-mirror.wml +++ b/docs/en/running-a-mirror.wml @@ -75,7 +75,8 @@ rsync -aq --delete rsync://rsync.torproject.org/dist-mirror/ /var/www/mirrors/to DocumentRoot /var/www/mirrors/torproject.org<br/> <Directory /var/www/mirrors/torproject.org/><br/> - Options MultiViews Indexes # Be sure to enable the autoindex and negotiation modules<br/> + # Be sure to enable the autoindex and negotiation modules<br/> + Options MultiViews Indexes<br/> DirectoryIndex index<br/> AllowOverride None<br/> </Directory><br/>

1 0

[webwml/staging] Bump stable version to 0.2.5
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit 6983edc6dcb37a87408e64d479bfdd108e7ef907 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 24 09:16:50 2014 -0400 Bump stable version to 0.2.5 Weasel informs me that the website probably doesn't support having two stable versions, or one stable and no alpha. So I'm marking 0.2.5.10 as stable _and_ development. I hope that doesn't explode. --- Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c22a34a..c4b5245 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.2.4.25 -export DEVTAG=tor-0.2.5.9-rc +export STABLETAG=tor-0.2.5.10 +export DEVTAG=tor-0.2.5.10 WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index f044790..4c8cd2e 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ -<define-tag version-stable whitespace=delete>0.2.4.25</define-tag> -<define-tag version-alpha whitespace=delete>0.2.5.9-rc</define-tag> +<define-tag version-stable whitespace=delete>0.2.5.10</define-tag> +<define-tag version-alpha whitespace=delete>0.2.5.10</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.4.23</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.4.23</define-tag>

1 0

[webwml/staging] switch to some new keys for jake
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit 6a51711b01f2c20595c1247d1c1d4c2d2abcf49e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 23 22:04:33 2014 -0400 switch to some new keys for jake --- docs/en/signing-keys.wml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index 5b30e42..d114f61 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -31,7 +31,7 @@ <li>The Tails team (0xBE2CD9C1) signs the Tails live system releases.</li> <li>Other developers include Peter Palfrader (0xC82E0039, or its - subkey 0xE1DEC577) and Jacob Appelbaum (0xE012B42D).</li> + subkey 0xE1DEC577) and Jacob Appelbaum (0xD255D3F5C868227F).</li> </ul> The fingerprints for the keys should be: @@ -123,7 +123,7 @@ pub 4096R/C5AA446D 2010-07-14 Key fingerprint = 261C 5FBE 7728 5F88 FB0C 3432 66C8 C2D7 C5AA 446D - uid Sebastian Hahn <mail(a)sebastianhahn.net> + uid Sebastian Hahn <mail(a)sebastianhahn.net> sub 2048R/A2499719 2010-07-14 sub 2048R/140C961B 2010-07-14 @@ -166,6 +166,24 @@ Key fingerprint = 4A90 646C 0BAE D9D4 56AB 3111 E5B8 1856 D022 0E4B uid Nicolas Vigier (TBB Builds Signing Key) <boklm(a)torproject.org> + pub 4096R/D255D3F5C868227F 2014-06-27 [expires: 2024-06-24] + Key fingerprint = D2C6 7D20 E9C3 6C2A C5FE 74A2 D255 D3F5 C868 227F + uid Jacob Appelbaum <jacob(a)appelbaum.net> + sub 3072R/02636620744301A2 2014-06-27 [expires: 2015-06-27] + sub 3072R/1A055A481801A819 2014-06-27 [expires: 2015-06-27] + + pub 4096R/90BC9192B06291B2 2014-06-27 [expires: 2024-06-24] + Key fingerprint = 043E 0E69 DD56 BA59 5905 8756 90BC 9192 B062 91B2 + uid Jacob Appelbaum <error(a)debian.org> + sub 3072R/F78ED60FFE4F141F 2014-06-27 [expires: 2015-06-27] + sub 3072R/986D6BCEF02A9C9C 2014-06-27 [expires: 2015-06-27] + sub 2048R/89AA6E5D2C6A7F40 2014-10-22 [expires: 2016-10-21] + + pub 4096R/FA7F0E44D487F03F 2014-06-27 [expires: 2024-06-24] + Key fingerprint = D6A9 48CF 297F 7539 30B4 756A FA7F 0E44 D487 F03F + uid Jacob Appelbaum <jacob(a)torproject.org> + sub 3072R/611B45DE2517F1BA 2014-06-27 [expires: 2015-06-27] + sub 3072R/035D7A9A67D22BC0 2014-06-27 [expires: 2015-06-27] </pre> </div>

1 0

[webwml/staging] update mrphs' description on coreppl page
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit 5d48abf35909f648c48d4df8841c77bd4958b64f Author: Nima Fatemi <mrphs(a)riseup.net> Date: Tue Oct 28 00:02:47 2014 +0000 update mrphs' description on coreppl page --- about/en/corepeople.wml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 0dffdc9..2c6ec68 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -95,9 +95,9 @@ href="https://fteproxy.org/">fteproxy</a>, and part of the pluggable transports team. Grad student at Portland State.</dd> - <dt>Nima Fatemi, Support</dt> - <dd>Farsi translator; helps answer all the users who contact - the support desk.</dd> + <dt>Nima Fatemi, Support, Advocate</dt> + <dd>Farsi team; helps answer all the users who contact + the support desk, does training and outreach and works on usability.</dd> <dt>David Fifield, Developer, Researcher</dt> <dd>Developer and co-inventor of <a

1 0

[webwml/staging] Delete unused tails icon
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit 24182b66f35c34a0832aad9138db47e8b55862ef Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Oct 28 09:10:15 2014 +0100 Delete unused tails icon --- images/icon-Tails.jpg | Bin 1683 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/icon-Tails.jpg b/images/icon-Tails.jpg deleted file mode 100644 index 20993d3..0000000 Binary files a/images/icon-Tails.jpg and /dev/null differ

1 0

[webwml/staging] update internetdefenseleague link to https ftw
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit b3233898fb46d1438516989ce91bad7560b32ec9 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Tue Oct 28 01:24:18 2014 +0000 update internetdefenseleague link to https ftw --- include/foot.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/foot.wmi b/include/foot.wmi index 7f4a9fc..14e5c45 100644 --- a/include/foot.wmi +++ b/include/foot.wmi @@ -62,7 +62,7 @@ </ul> </div> <div class="col"> - <a href="http://internetdefenseleague.org/"><img src="$(IMGROOT)/InternetDefenseLeague-footer-badge.png" alt="Internet Defense League"></a> + <a href="https://internetdefenseleague.org/"><img src="$(IMGROOT)/InternetDefenseLeague-footer-badge.png" alt="Internet Defense League"></a> </div>

1 0

[webwml/staging] update tails logo
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit 24f243c17f52839485cb66f204becaabddd96897 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Tue Oct 28 01:21:37 2014 +0000 update tails logo --- en/index.wml | 2 +- images/tails_logo.png | Bin 0 -> 21522 bytes projects/en/projects.wml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/index.wml b/en/index.wml index 5ee8d4d..8bacbf2 100644 --- a/en/index.wml +++ b/en/index.wml @@ -58,7 +58,7 @@ <td> <div class="project"> <a href="https://tails.boum.org/"><img - src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon"></a> + src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> <h3><a href="https://tails.boum.org/">Tails</a></h3> <p>Live CD/USB operating system preconfigured to use Tor safely.</p> diff --git a/images/tails_logo.png b/images/tails_logo.png new file mode 100644 index 0000000..df5f52e Binary files /dev/null and b/images/tails_logo.png differ diff --git a/projects/en/projects.wml b/projects/en/projects.wml index e3f4604..e4cf2e7 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -110,7 +110,7 @@ href="https://stem.torproject.org/">Stem</a></div> <div class="projectbox"> <a href="https://tails.boum.org/"><img class="icon" -src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon" width="75" +src="$(IMGROOT)/tails_logo.png" alt="Tails Logo" width="75" height="75"></a> <div class="projectdesc"><div class="name"><a href="https://tails.boum.org/">Tails</a></div>

1 0

[webwml/staging] The short user manual is gone
by sebastian＠torproject.org 28 Oct '14

28 Oct '14

commit e49754a4f692dbe2724003bcb98a0dd3218e49f2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Oct 28 09:04:27 2014 +0100 The short user manual is gone Stop linking to nonexistent binaries and essentially outdated pages. Inspired by patch to this page from mrphs. --- .gitignore | 1 - docs/en/short-user-manual.wml | 55 ----------------------------------------- docs/en/sidenav.wmi | 4 --- docs/torbutton/en/sidenav.wmi | 4 --- 4 files changed, 64 deletions(-) diff --git a/.gitignore b/.gitignore index c8e79d1..4e539a7 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,6 @@ docs/pluggable-transports.html.en docs/proxychain.html.en docs/rpms.html.en docs/running-a-mirror.html.en -docs/short-user-manual.html.en docs/signing-keys.html.en docs/tor-doc-osx.html.en docs/tor-doc-relay.html.en diff --git a/docs/en/short-user-manual.wml b/docs/en/short-user-manual.wml deleted file mode 100644 index f1ba1cd..0000000 --- a/docs/en/short-user-manual.wml +++ /dev/null @@ -1,55 +0,0 @@ -## translation metadata -# Revision: $Revision: 25138 $ -# Translation-Priority: 2-medium - -#include "head.wmi" TITLE="Tor Project: FAQ" 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/short-user-manual>">Short User Manual</a> - </div> - <div id="maincol"> -  - <h1>Short User Manual</h1> - <hr> - - <p>The short user manual contains information about how to download - Tor, how to use it, and what to do if Tor is unable to connect to the - network. If you can't find the answer to your question in this document, - email <i>help at rt.torproject.org</i>.</p> - - <p>The user manual is available in the following languages:</p> - <ul> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_ar.xhtml">Arabic</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_zh_CN.xhtml">Chinese</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_cs.xhtml">Czech</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_nl.xhtml">Dutch</a></li> - <li><a href="https://torproject.org/dist/manual/short-user-manual_en.xhtml">English</a></li> - <li><a href="https://torproject.org/dist/manual/short-user-manual_fa.xhtml">Farsi</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_fr.xhtml">French</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_de.xhtml">German</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_el.xhtml">Greek</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_hu.xhtml">Hungarian</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_it.xhtml">Italian</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_ja.xhtml">Japanese</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_lv.xhtml">Latvian</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_nb.xhtml">Norwegian</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_pl.xhtml">Polish</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_pt_BR.xhtml">Portuguese</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_ru.xhtml">Russian</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_es.xhtml">Spanish</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_sv.xhtml">Swedish</a></li> - <li><a href="https://www.torproject.org/dist/manual/short-user-manual_tr.xhtml">Turkish</a></li> - </ul> - - </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 8aee928..e0867ed 100644 --- a/docs/en/sidenav.wmi +++ b/docs/en/sidenav.wmi @@ -55,10 +55,6 @@ {'url' => 'docs/manual', 'txt' => 'Manuals', 'subelements' => [ - { - 'url' => 'docs/short-user-manual', - 'txt' => 'Short User Manual', - }, {'url' => 'docs/tor-relay-debian', 'txt' => 'Configuring a Relay manually', }, diff --git a/docs/torbutton/en/sidenav.wmi b/docs/torbutton/en/sidenav.wmi index 0c55730..9b02b91 100644 --- a/docs/torbutton/en/sidenav.wmi +++ b/docs/torbutton/en/sidenav.wmi @@ -52,10 +52,6 @@ {'url' => 'docs/manual', 'txt' => 'Manuals', 'subelements' => [ - { - 'url' => 'docs/short-user-manual', - 'txt' => 'Short User Manual', - }, {'url' => 'docs/tor-relay-debian', 'txt' => 'Configuring a Relay manually', },

1 0