January 2017 - tor-commits - lists.torproject.org

[webwml/staging] Don't redirect amazon donation page
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit ff8816dfe60ef2a969272d9c80c58eb246bacdcd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 03:15:36 2016 +0100 Don't redirect amazon donation page --- .htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 5d0277a..78d191d 100644 --- a/.htaccess +++ b/.htaccess @@ -70,8 +70,9 @@ RewriteRule ^js/$ / [R=301,L] # Donation campagin # 2016 -# Special-case the donate-options page so it doesn't get redirected +# Special-case the donate-options and amazon page so it doesn't get redirected RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END] +RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END] RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L] RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L]

1 0

[webwml/staging] : -> .
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 6aeb56ec579e45dbb98e57f2e51dd1b88bf96c27 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 23:40:10 2016 +0100 : -> . --- about/en/jobs-coredev.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/jobs-coredev.wml b/about/en/jobs-coredev.wml index bc6020e..2ee0f7f 100644 --- a/about/en/jobs-coredev.wml +++ b/about/en/jobs-coredev.wml @@ -82,7 +82,7 @@ programs</li> projects</li> <li>Genuine excitement about Tor and its values! Follow this link to view the <a href="https://blog.torproject.org/blog/tor-social-contract">Tor -Project social contract</a>: +Project social contract</a>. </li> </ul>

1 0

[webwml/staging] Add another desired quality to job posting
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 1a14eca4a8b5b44638a310fa68976b00d866a8d7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Dec 5 21:39:50 2016 +0100 Add another desired quality to job posting --- about/en/jobs-coredev.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/about/en/jobs-coredev.wml b/about/en/jobs-coredev.wml index 2ee0f7f..48f7ec6 100644 --- a/about/en/jobs-coredev.wml +++ b/about/en/jobs-coredev.wml @@ -80,6 +80,7 @@ varying skill levels</li> programs</li> <li>History of significant code contributions to multiple open-source projects</li> +<li>Experience with development on Microsoft Windows</li> <li>Genuine excitement about Tor and its values! Follow this link to view the <a href="https://blog.torproject.org/blog/tor-social-contract">Tor Project social contract</a>.

1 0

[webwml/staging] Add note explaining a redirect
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 4febd93ed15ea04d7a1effad8c3173809fa1dff2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Dec 5 21:39:12 2016 +0100 Add note explaining a redirect --- .htaccess | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.htaccess b/.htaccess index e45402c..638c2ee 100644 --- a/.htaccess +++ b/.htaccess @@ -76,6 +76,10 @@ RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END] RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L] RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L] + +# The following redirect is necessary because we're using that URL on +# some external resources (the donate infrastructure in particular) and +# getting it changed there is apparently hard or something. RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L]

1 0

[webwml/staging] Whoops; rc, not alpha.
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit e2e9d5ef8076a940fda463c8c88cf25de20c1eb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 11:12:13 2016 -0500 Whoops; rc, not alpha. --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index badd8e8..449c373 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.2.8.10 -export DEVTAG=tor-0.2.9.6-alpha +export DEVTAG=tor-0.2.9.6-rc WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index 8c4c989..4569fc6 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.8.10</define-tag> -<define-tag version-alpha whitespace=delete>0.2.9.6-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.9.6-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.8.9</define-tag>

1 0

[webwml/staging] Scramble to get shit less fucked up
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 6e861cd4a30fc3ef1b69bbb61a3a947e067eb173 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 3 00:59:34 2016 +0100 Scramble to get shit less fucked up --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 78d191d..e45402c 100644 --- a/.htaccess +++ b/.htaccess @@ -76,5 +76,6 @@ RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END] RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L] RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L] +RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L]

1 0

[webwml/staging] experimental is 0.3.0.x now, add yakkety
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 62636e8266d7195f1a2d2c8c4745ce04a33bd10e Author: Peter Palfrader <peter(a)palfrader.org> Date: Tue Dec 27 12:58:14 2016 +0100 experimental is 0.3.0.x now, add yakkety --- docs/en/debian.wml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index 3b1bf0b..83486f3 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -19,8 +19,9 @@ var software = { 'precise': [ 'precise'], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], + 'yakkety': [ 'yakkety'], }, - 'experimental-0.2.9.x': { + 'experimental-0.3.0.x': { 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], @@ -28,6 +29,7 @@ var software = { 'precise': [ 'precise'], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], + 'yakkety': [ 'yakkety'], }, }, 'tor (from source)': { @@ -39,8 +41,9 @@ var software = { 'precise': [ 'precise'], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], + 'yakkety': [ 'yakkety'], }, - 'experimental-0.2.9.x': { + 'experimental-0.3.0.x': { 'wheezy': [ 'wheezy' ], 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], @@ -48,6 +51,7 @@ var software = { 'precise': [ 'precise'], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], + 'yakkety': [ 'yakkety'], }, }, }; @@ -360,7 +364,7 @@ download/download>#packagediff">development branch</a> of Tor instead to your <tt>/etc/apt/sources.list</tt> file: <pre style="margin: 1.5em 0 1.5em 2em"> deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main -deb http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main +deb http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main </pre> where you again substitute the name of your distro (lenny, sid, saucy, ...) in place of @@ -398,7 +402,7 @@ deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main # For the unstable version. deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main -deb-src http://deb.torproject.org/torproject.org tor-experimental-0.2.9.x-<DISTRIBUTION> main +deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.0.x-<DISTRIBUTION> main </pre> Substitute the name of your distro (wheezy, sid, trusty, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): <pre style="margin: 1.5em 0 1.5em 2em">

1 0

[webwml/staging] Bug 20954: Checking OS X bundles with sha256sum does not work
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 67fd39679adbb1db5fc1af49e40332037e769508 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 12 18:58:41 2016 +0000 Bug 20954: Checking OS X bundles with sha256sum does not work Due to Apple's codesigning requirement one can't simply compare hash values to check whether a self-compiled bundle is matching the one we ship. Yet our documentation seems to imply that. We should point this problem out for now until we come up with a better solution. --- docs/en/verifying-signatures.wml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index 12678b0..95cdb01 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -230,7 +230,10 @@ Windows you can use the <a href="http://md5deep.sourceforge.net/"> hashdeep utility</a> and run <pre>C:\location\where\you\saved\hashdeep -c sha256sum <TOR BROWSER FILE NAME>.exe</pre> - On Mac or Linux you can run <pre>shasum -a 256 <TOR BROWSER FILE NAME>.dmg</pre> or <pre>sha256sum <TOR BROWSER FILE NAME>.tar.gz</pre> without having to download a utility.</li> + On Linux you can run + <pre>sha256sum <TOR BROWSER FILE NAME>.tar.gz</pre> + without having to download a utility. Note: this does not work for OS X + yet due to Apple's codesigning requirement.</li> <li>You will see a string of letters and numbers.</li> <li>Open <tt>sha256sums-unsigned-build.txt</tt> in a text editor.</li> <li>Locate the name of the Tor Browser file you downloaded.</li>

1 0

[webwml/staging] Bug 20901: Switch pt-PT to pt-BR for Tor Browser alphas
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 51fbb79d7785d2b397a1b87b364c242f23bf06b5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 14 12:08:56 2016 +0000 Bug 20901: Switch pt-PT to pt-BR for Tor Browser alphas --- projects/en/torbrowser.wml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 19f12e2..45a46fb 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -470,17 +470,17 @@ (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pl.tar.xz.asc">sig</a>)</td> </tr> <tr> - <td>Português (pt-PT)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-PT.exe">32/64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-PT.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_pt-PT.dmg">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_pt-PT.dmg.asc">sig</a>) + <td>Português (pt-BR)</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-BR.exe">32/64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/torbrowser-install-<version-torbrowserbundlebeta>_pt-BR.exe.asc">sig</a>)</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_pt-BR.dmg">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/TorBrowser-<version-torbrowserbundleosx64beta>-osx64_pt-BR.dmg.asc">sig</a>)  - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-PT.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-PT.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-PT.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-PT.tar.xz.asc">sig</a>)</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-BR.tar.xz">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux32-<version-torbrowserbundlelinux32beta>_pt-BR.tar.xz.asc">sig</a>) + • <a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-BR.tar.xz">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>/tor-browser-linux64-<version-torbrowserbundlelinux64beta>_pt-BR.tar.xz.asc">sig</a>)</td> </tr> <tr class="alt"> <td>Русский (ru)</td>

1 0

[webwml/staging] Adding new Tor Browser alpha (6.5a6)
by hiro＠torproject.org 12 Jan '17

12 Jan '17

commit 187d6039badfaa5b11e041b87aaefdc8d7e2d901 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 14 12:38:14 2016 +0000 Adding new Tor Browser alpha (6.5a6) --- include/versions.wmi | 18 +++++++++--------- projects/torbrowser/RecommendedTBBVersions | 8 +++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 9879df0..ed6d397 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,28 +5,28 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.0</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>6.0.8</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a5</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a6</define-tag> <define-tag version-torbrowserbundle whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundle whitespace=delete>2016-12-13</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a5</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-12-1</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>6.5a6</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-12-14</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-12-13</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-12-13</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a5</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-12-1</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a5</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-12-1</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a6</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-12-14</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a6</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-12-14</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-12-13</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>6.0.8</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-12-13</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a5</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-12-1</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a6</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-12-14</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 f681596..d593897 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -12,5 +12,11 @@ "6.5a5-MacOS", "6.5a5-Windows", "6.5a5-hardened", -"6.5a5-hardened-Linux" +"6.5a5-hardened-Linux", +"6.5a6", +"6.5a6-Linux", +"6.5a6-MacOS", +"6.5a6-Windows", +"6.5a6-hardened", +"6.5a6-hardened-Linux" ]

1 0