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

[webwml/staging] Move version-win32-stable closer to version-torbrowserbundle-all
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit e23dad8b56ce5f6b8574967ff505f52596703512 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Dec 9 16:22:36 2017 +0100 Move version-win32-stable closer to version-torbrowserbundle-all --- include/versions.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/versions.wmi b/include/versions.wmi index b0471460..4b256bf5 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -6,6 +6,7 @@ # *** tor browser stable *** <define-tag version-torbrowserbundle-all whitespace=delete>7.0.11</define-tag> <define-tag releasedate-torbrowserbundle-all whitespace=delete>2017-12-09</define-tag> +<define-tag version-win32-stable whitespace=delete>0.3.1.9</define-tag> # If all platforms are on the same version, you only to update # version-torbrowserbundle-all and releasedate-torbrowserbundle-all @@ -18,7 +19,6 @@ <let version-torbrowserbundleosx64=version-torbrowserbundle-all /> <let releasedate-torbrowserbundleosx64=releasedate-torbrowserbundle-all /> -<define-tag version-win32-stable whitespace=delete>0.3.1.9</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag> # *** tor browser beta/alpha ***

1 0

[webwml/staging] Add new Tor Browser version: 7.0.11
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit e50fb2e5974b97fa03f0f2094c7b179fb4d592a3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Dec 9 16:19:17 2017 +0100 Add new Tor Browser version: 7.0.11 --- include/versions.wmi | 6 +++--- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index f7073ca7..b0471460 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -4,8 +4,8 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.0</define-tag> # *** tor browser stable *** -<define-tag version-torbrowserbundle-all whitespace=delete>7.0.10</define-tag> -<define-tag releasedate-torbrowserbundle-all whitespace=delete>2017-11-14</define-tag> +<define-tag version-torbrowserbundle-all whitespace=delete>7.0.11</define-tag> +<define-tag releasedate-torbrowserbundle-all whitespace=delete>2017-12-09</define-tag> # If all platforms are on the same version, you only to update # version-torbrowserbundle-all and releasedate-torbrowserbundle-all @@ -18,7 +18,7 @@ <let version-torbrowserbundleosx64=version-torbrowserbundle-all /> <let releasedate-torbrowserbundleosx64=releasedate-torbrowserbundle-all /> -<define-tag version-win32-stable whitespace=delete>0.3.1.8</define-tag> +<define-tag version-win32-stable whitespace=delete>0.3.1.9</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag> # *** tor browser beta/alpha *** diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index f251c2cc..0b297a10 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "7.0.10-MacOS", "7.0.10-Linux", "7.0.10-Windows", +"7.0.11", +"7.0.11-MacOS", +"7.0.11-Linux", +"7.0.11-Windows", "7.5a8", "7.5a8-MacOS", "7.5a8-Linux",

1 0

[webwml/staging] 0.3.2.7-rc is released
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 4513f113b6f71ac7b75c7f8b952f6ad22111d630 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 14 14:00:54 2017 -0500 0.3.2.7-rc is released --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5f768488..8372d43a 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.1.9 -export DEVTAG=tor-0.3.2.6-alpha +export DEVTAG=tor-0.3.2.7-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 5734c1c4..d229f94e 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.3.1.9</define-tag> -<define-tag version-alpha whitespace=delete>0.3.2.6-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.3.2.7-rc</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.0</define-tag>

1 0

[webwml/staging] Deprecate old Tor Browser versions
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 53990269cabe7f7e7481dca7d1622fa8778bff8c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 11 13:20:49 2017 +0000 Deprecate old Tor Browser versions --- projects/torbrowser/RecommendedTBBVersions | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 34b9545e..ebc53c6e 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,16 +1,8 @@ [ -"7.0.10", -"7.0.10-MacOS", -"7.0.10-Linux", -"7.0.10-Windows", "7.0.11", "7.0.11-MacOS", "7.0.11-Linux", "7.0.11-Windows", -"7.5a8", -"7.5a8-MacOS", -"7.5a8-Linux", -"7.5a8-Windows", "7.5a9", "7.5a9-MacOS", "7.5a9-Linux",

1 0

[webwml/staging] Merge remote-tracking branch 'kat/tor-users-dead-links'
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit bc2c344347a0d69af008941580a7c4c0c5f787ff Merge: 9f5f29d3 8d7dd7b6 Author: hiromipaw <hiro(a)torproject.org> Date: Mon Dec 4 18:16:51 2017 +0100 Merge remote-tracking branch 'kat/tor-users-dead-links' about/en/torusers.wml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)

1 0

[webwml/staging] Add new Tor Browser version: 7.5a10
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 86a86d757a0fa56cc1117f489c870861e0eaaaa0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Dec 20 11:22:02 2017 +0100 Add new Tor Browser version: 7.5a10 --- include/versions.wmi | 4 ++-- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index d229f94e..cd45bf00 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -22,8 +22,8 @@ <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag> # *** tor browser beta/alpha *** -<define-tag version-torbrowserbundlebeta-all whitespace=delete>7.5a9</define-tag> -<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2017-12-09</define-tag> +<define-tag version-torbrowserbundlebeta-all whitespace=delete>7.5a10</define-tag> +<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2017-12-20</define-tag> <define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.16</define-tag> # If all platforms are on the same version, you only need to update diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index ebc53c6e..382fc74b 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -6,5 +6,9 @@ "7.5a9", "7.5a9-MacOS", "7.5a9-Linux", -"7.5a9-Windows" +"7.5a9-Windows", +"7.5a10", +"7.5a10-MacOS", +"7.5a10-Linux", +"7.5a10-Windows" ]

1 0

[webwml/staging] Fix thankyou redirect
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 4771d7febbf328adc64382fb7b5e00edcaef1f53 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 20 11:46:50 2017 +0100 Fix thankyou redirect --- .htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index f6442986..86a523e0 100644 --- a/.htaccess +++ b/.htaccess @@ -74,7 +74,7 @@ RewriteRule ^images/$ / [R=301,L] RewriteRule ^include/$ / [R=301,L] RewriteRule ^js/$ / [R=301,L] -# Donation campagin +# Donation campaign # 2017 # Special-case the donate-options and amazon page so it doesn't get redirected RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END] @@ -82,6 +82,7 @@ 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 [R=302,L] RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] +RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] # The following redirect is necessary because we're using that URL on

1 0

[webwml/staging] Add onion thanks page w onion eating fest
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit cb473f604a760280a587f498bc8069d3d05ce9d2 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Dec 21 13:10:35 2017 +0100 Add onion thanks page w onion eating fest --- en/averyonionthankyou.wml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/en/averyonionthankyou.wml b/en/averyonionthankyou.wml new file mode 100644 index 00000000..777be5e8 --- /dev/null +++ b/en/averyonionthankyou.wml @@ -0,0 +1,7 @@ +#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" DONATION_BANNER="true" + +<div id="home"> +<iframe width="560" height="315" src="https://www.youtube.com/embed/TXT0F7p7WbM" frameborder="0" gesture="media" allow="encrypted-media" allowfullscreen></iframe> +</div> + +#include <foot.wmi> \ No newline at end of file

1 0

[webwml/staging] Add redirect for youtube embed
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 8bb696171d1e61fe1bc8396315fefa85b6a5051a Author: hiromipaw <hiro(a)torproject.org> Date: Thu Dec 21 13:31:02 2017 +0100 Add redirect for youtube embed --- .htaccess | 2 ++ en/averyonionthankyou.wml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 86a523e0..21386d6f 100644 --- a/.htaccess +++ b/.htaccess @@ -84,6 +84,8 @@ RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] +RewriteRule ^averyonionthankyou(.*) /averyonionthankyou.html.en [R=302,L] +RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=302,L] # The following redirect is necessary because we're using that URL on # some external resources (the donate infrastructure in particular) and diff --git a/en/averyonionthankyou.wml b/en/averyonionthankyou.wml index 777be5e8..62ddb5a3 100644 --- a/en/averyonionthankyou.wml +++ b/en/averyonionthankyou.wml @@ -1,7 +1,7 @@ #include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" DONATION_BANNER="true" <div id="home"> -<iframe width="560" height="315" src="https://www.youtube.com/embed/TXT0F7p7WbM" frameborder="0" gesture="media" allow="encrypted-media" allowfullscreen></iframe> +<iframe width="560" height="315" src="embed/onionvideo" frameborder="0" gesture="media" allow="encrypted-media" allowfullscreen></iframe> </div> #include <foot.wmi> \ No newline at end of file

1 0

[webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 753c7af4b1d892c8b6397a47daac4e4968298dc0 Merge: 4771d7fe 86a86d75 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Dec 20 11:47:04 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml include/versions.wmi | 4 ++-- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0