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

[meek/master] Fix a2x example in meek-server.1.txt.
by dcf＠torproject.org 19 Dec '15

19 Dec '15

commit e6da91af5301c7e19ddd39ed59ae6f7a38a8fd86 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 18 21:31:56 2015 -0800 Fix a2x example in meek-server.1.txt. --- doc/meek-server.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/meek-server.1.txt b/doc/meek-server.1.txt index 855a20b..3ba6b5a 100644 --- a/doc/meek-server.1.txt +++ b/doc/meek-server.1.txt @@ -1,6 +1,6 @@ // This file is asciidoc source code. // To generate manpages, use the a2x command i.e. -// a2x --no-xmllint -d manpage -f manpage meek-client.1.txt +// a2x --no-xmllint -d manpage -f manpage meek-server.1.txt // see http://www.methods.co.nz/asciidoc/userguide.html#X1 MEEK-SERVER(1) ==============

1 0

[webwml/master] Bug #17880: Donation banner on home page
by sebastian＠torproject.org 19 Dec '15

19 Dec '15

commit 8b7fb8a46588da4dc8c991be396fa3b1f4a66ef4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Dec 18 16:17:23 2015 -0500 Bug #17880: Donation banner on home page --- css/layout.css | 33 +++++++++++++++++++++++++++++++++ en/index.wml | 24 ++++++++++++++++++++++++ images/homepage-banner-cd.jpg | Bin 0 -> 84779 bytes images/homepage-banner-lp.jpg | Bin 0 -> 101171 bytes images/homepage-banner-rd.jpg | Bin 0 -> 86882 bytes images/homepage-banner-rr.jpg | Bin 0 -> 98192 bytes images/homepage-banner-ss.jpg | Bin 0 -> 92697 bytes 7 files changed, 57 insertions(+) diff --git a/css/layout.css b/css/layout.css index 4908ee0..e0cd4a1 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1310,3 +1310,36 @@ p.blogDate { } /* End hide from IE-mac */ +#donation-banner { + display: block; + height: 200px; + margin: auto; + margin-bottom: 5px; + position: relative; + width: 700px; +} + +#donation-banner > a { + display: block; +} + +#donation-banner > img { + display: block; +} + +#donate-button { + background-color: green; + border-radius: 5px; + bottom: 15px; + color: white; + font-family: sans-serif; + font-size: 20px; + padding: 14px 14px; + position: absolute; + right: 15px; + text-align: center; +} + +#donate-button:hover { + filter: brightness(1.2); +} diff --git a/en/index.wml b/en/index.wml index fededd4..09ed2c8 100644 --- a/en/index.wml +++ b/en/index.wml @@ -2,6 +2,30 @@ # Revision: $Revision$ # Translation-Priority: 1-high + +<div id="donation-banner"> + <a href="donate/donate-hpbanner.html.en"> + <noscript> +  + <img id="donation-banner-image-noscript" src="images/homepage-banner-ss.jpg" /> + </noscript> +  + <img id="donation-banner-image"" /> + </a> + <a href="donate/donate-hpbanner.html.en"> + <div id="donate-button">Please Donate!</div> + </a> +</div> + +<script> +  + var alternates = ["cd", "lp", "rd", "rr", "ss"]; + var alternate = alternates[Math.floor(Math.random() * alternates.length)]; + var image = document.getElementById("donation-banner-image"); + image.src = "images/homepage-banner-" + alternate + ".jpg"; +</script> + #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" <div id="home"> diff --git a/images/homepage-banner-cd.jpg b/images/homepage-banner-cd.jpg new file mode 100755 index 0000000..4c0e4b3 Binary files /dev/null and b/images/homepage-banner-cd.jpg differ diff --git a/images/homepage-banner-lp.jpg b/images/homepage-banner-lp.jpg new file mode 100755 index 0000000..f5fa76a Binary files /dev/null and b/images/homepage-banner-lp.jpg differ diff --git a/images/homepage-banner-rd.jpg b/images/homepage-banner-rd.jpg new file mode 100755 index 0000000..646f59e Binary files /dev/null and b/images/homepage-banner-rd.jpg differ diff --git a/images/homepage-banner-rr.jpg b/images/homepage-banner-rr.jpg new file mode 100755 index 0000000..4a2a512 Binary files /dev/null and b/images/homepage-banner-rr.jpg differ diff --git a/images/homepage-banner-ss.jpg b/images/homepage-banner-ss.jpg new file mode 100755 index 0000000..c4a0fa7 Binary files /dev/null and b/images/homepage-banner-ss.jpg differ

1 0

[webwml/master] Merge remote-tracking branch 'arthuredelstein/17880'
by sebastian＠torproject.org 19 Dec '15

19 Dec '15

commit 787af285dd02dd74f1020114c68df9be0d30440a Merge: 4f9a858 8b7fb8a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 19 02:09:57 2015 +0100 Merge remote-tracking branch 'arthuredelstein/17880' css/layout.css | 33 +++++++++++++++++++++++++++++++++ en/index.wml | 24 ++++++++++++++++++++++++ images/homepage-banner-cd.jpg | Bin 0 -> 84779 bytes images/homepage-banner-lp.jpg | Bin 0 -> 101171 bytes images/homepage-banner-rd.jpg | Bin 0 -> 86882 bytes images/homepage-banner-rr.jpg | Bin 0 -> 98192 bytes images/homepage-banner-ss.jpg | Bin 0 -> 92697 bytes 7 files changed, 57 insertions(+)

1 0

[webwml/staging] Add new TBB version
by sebastian＠torproject.org 19 Dec '15

19 Dec '15

commit fdf4afa0641155f834e2a7ab942e6d90ba641d35 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 16 09:37:35 2015 +0000 Add new TBB version --- include/versions.wmi | 14 +++++++------- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index a3f0cce..d2b3745 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,7 +1,7 @@ <define-tag version-stable whitespace=delete>0.2.7.6</define-tag> <define-tag version-alpha whitespace=delete>0.2.7.6</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.6.10</define-tag> +<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> @@ -18,10 +18,10 @@ <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.0.4</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.0.5</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a4</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>5.0.4</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.0.5</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>5.5a4</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> @@ -31,8 +31,8 @@ <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.0.4</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.4</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.5</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.5</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a4</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a4</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -40,8 +40,8 @@ <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.0.4</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.4</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.5</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.5</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a4</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> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 3beaf87..238c801 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "5.0.4-Linux", "5.0.4-MacOS", "5.0.4-Windows", +"5.0.5", +"5.0.5-Linux", +"5.0.5-MacOS", +"5.0.5-Windows", "5.5a4", "5.5a4-Linux", "5.5a4-MacOS",

1 0

[webwml/staging] add donate-blog-cory
by sebastian＠torproject.org 19 Dec '15

19 Dec '15

commit d78871221175024df5a9862cba29c545c607fc03 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Dec 17 23:03:34 2015 +0100 add donate-blog-cory --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 80e192b..0ba4884 100644 --- a/.htaccess +++ b/.htaccess @@ -62,4 +62,5 @@ RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-blog-cory.wml b/donate/en/donate-blog-cory.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] Add new TBB version
by sebastian＠torproject.org 19 Dec '15

19 Dec '15

commit c57ae616ea27e5a01f05d94c12b7afb0a7846c7d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 18 05:22:50 2015 +0000 Add new TBB 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 d2b3745..d87725e 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,10 +18,10 @@ <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.0.5</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a4</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>5.0.5</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>5.5a4</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> @@ -31,8 +31,8 @@ <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.0.5</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.5</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a4</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a4</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -40,8 +40,8 @@ <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.0.5</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.5</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a4</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> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 238c801..d6cf460 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,6 +7,10 @@ "5.0.5-Linux", "5.0.5-MacOS", "5.0.5-Windows", +"5.0.6", +"5.0.6-Linux", +"5.0.6-MacOS", +"5.0.6-Windows", "5.5a4", "5.5a4-Linux", "5.5a4-MacOS",

1 0

[webwml/staging] Add new TBB version, remove 5.0.4
by sebastian＠torproject.org 19 Dec '15

19 Dec '15

commit db011e5aca9e9a9032ab3fbc6894e715c1eba8b0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 18 11:50:51 2015 +0000 Add new TBB version, remove 5.0.4 --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index d87725e..287c49d 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -19,10 +19,10 @@ <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a4</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a5</define-tag> <define-tag version-torbrowserbundle whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a4</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>5.5a5</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> @@ -33,8 +33,8 @@ <define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a4</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a4</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a5</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a5</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> @@ -42,7 +42,7 @@ <define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.6</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a4</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a5</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> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index d6cf460..49b35e9 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,8 +1,4 @@ [ -"5.0.4", -"5.0.4-Linux", -"5.0.4-MacOS", -"5.0.4-Windows", "5.0.5", "5.0.5-Linux", "5.0.5-MacOS", @@ -15,6 +11,10 @@ "5.5a4-Linux", "5.5a4-MacOS", "5.5a4-Windows", +"5.5a5", +"5.5a5-Linux", +"5.5a5-MacOS", +"5.5a5-Windows", "5.5a4-hardened", "5.5a4-hardened-Linux" ]

1 0

[webwml/staging] Add new TBB version
by sebastian＠torproject.org 19 Dec '15

19 Dec '15

commit feae0d1904e8f52e5c3f33e19e480fa7f0c94154 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 18 12:10:03 2015 +0000 Add new TBB version --- projects/torbrowser/RecommendedTBBVersions | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 49b35e9..82c8ee9 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -16,5 +16,7 @@ "5.5a5-MacOS", "5.5a5-Windows", "5.5a4-hardened", -"5.5a4-hardened-Linux" +"5.5a4-hardened-Linux", +"5.5a5-hardened", +"5.5a5-hardened-Linux" ]

1 0

[webwml/staging] Add donate-hpbanner redirect
by sebastian＠torproject.org 19 Dec '15

19 Dec '15

commit 582edea08adfb1c085ffa80c581243a4fbc33de4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 19 02:00:32 2015 +0100 Add donate-hpbanner redirect --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 0ba4884..642f8ed 100644 --- a/.htaccess +++ b/.htaccess @@ -63,4 +63,5 @@ RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-hpbanner.wml b/donate/en/donate-hpbanner.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] arthuredelstein just noticed this fuckup
by sebastian＠torproject.org 19 Dec '15

19 Dec '15

commit 4f9a8587df198c07b4fc426274c25e001b00d030 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 19 02:05:23 2015 +0100 arthuredelstein just noticed this fuckup --- .htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 642f8ed..8870a5a 100644 --- a/.htaccess +++ b/.htaccess @@ -53,7 +53,6 @@ RewriteRule ^relays(.*) /getinvolved/relays [R=301,L] # Donation campagin RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] @@ -64,4 +63,6 @@ RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] +#keep prefixes of other entries down here... +RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]

1 0