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

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 24 Nov '15

24 Nov '15

commit 8b6d0a040a5e1859355c59148036ab573aa27cd3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 24 21:15:11 2015 +0000 Update translations for whisperback --- he/he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/he.po b/he/he.po index 09772d5..7df0809 100644 --- a/he/he.po +++ b/he/he.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-09-24 09:06+0000\n" +"PO-Revision-Date: 2015-11-24 20:52+0000\n" "Last-Translator: Kunda\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n"

1 0

[tor-browser-bundle/hardened-builds] Bug 13819: Ship expert bundles with console
by gk＠torproject.org 24 Nov '15

24 Nov '15

commit e4b449bef3f7d44f8533c7d1bdd54cdf0535887f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 21 08:47:47 2015 +0000 Bug 13819: Ship expert bundles with console Currently, the expert bundles are identical to the tor software we ship in Tor Browser. This means there is no console showing up displaying status messages while tor and the browser are running. This commit fixes this by compiling tor twice, once for Tor Browser without console showing up and the second time with the console enabled. The first goes into Tor Browser and the second one is used for the expert bundle. --- gitian/descriptors/windows/gitian-tor.yml | 50 ++++++++++++++++++++--------- gitian/mkbundle-windows.sh | 7 ++-- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 9d6838c..601dc4e 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -65,20 +65,38 @@ script: | fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src - # Let's avoid the console window popping up. - export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" - export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs" - ./autogen.sh - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - ./configure --disable-asciidoc --host=i686-w64-mingw32 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/ - make $MAKEOPTS - make install - cd .. - install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ - cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ - cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/ + # We are building normal bundles without the console popping up and expert + # ones with. See bug 13819 for the request and details. + mkdir build + BUILDS="normal expert" + for BUILD in $BUILDS + do + if [ "$BUILD" == "expert" ] + then + FLAG="" + BUNDLE="expert-" + else + FLAG="-mwindows" + BUNDLE="" + fi + export CFLAGS="$FLAG -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" + export LDFLAGS="$FLAG -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs" + ./autogen.sh + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + cd build + ../configure --disable-asciidoc --host=i686-w64-mingw32 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/ + make $MAKEOPTS + make install + cd ../.. + install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ + cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ + cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/ - # Grabbing the result - cd $INSTDIR - ~/build/dzip.sh tor-win32-gbuilt.zip Tor/ Data/ - cp tor-win32-gbuilt.zip $OUTDIR/ + # Grabbing the result + cd $INSTDIR + ~/build/dzip.sh tor-win32-${BUNDLE}gbuilt.zip Tor/ Data/ + cp tor-win32-${BUNDLE}gbuilt.zip $OUTDIR/ + cd ~/build/tor + # Remove artifacts of the previous build + rm -rf build/* + done diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 8f89123..6aeec8a 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -148,7 +148,8 @@ else cd .. fi -if [ ! -f inputs/tor-win32-gbuilt.zip ]; +if [ ! -f inputs/tor-win32-gbuilt.zip -o \ + ! -f inputs/tor-win32-expert-gbuilt.zip ]; then echo echo "****** Starting Tor Component of Windows Bundle (2/5 for Windows) ******" @@ -161,7 +162,7 @@ then exit 1 fi - cp -a build/out/tor-win32-gbuilt.zip inputs/ + cp -a build/out/tor-win32-*gbuilt.zip inputs/ #cp -a result/tor-windows-res.yml inputs/ else echo @@ -230,7 +231,7 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 - cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 + cp -a inputs/tor-win32-expert-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 touch inputs/bundle-windows.gbuilt else echo

1 0

[tor-browser-bundle/master] Bug 13819: Ship expert bundles with console
by gk＠torproject.org 24 Nov '15

24 Nov '15

commit eaec9e80ac9a2a490456b4d6d3805f66dfa0a627 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 21 08:47:47 2015 +0000 Bug 13819: Ship expert bundles with console Currently, the expert bundles are identical to the tor software we ship in Tor Browser. This means there is no console showing up displaying status messages while tor and the browser are running. This commit fixes this by compiling tor twice, once for Tor Browser without console showing up and the second time with the console enabled. The first goes into Tor Browser and the second one is used for the expert bundle. --- gitian/descriptors/windows/gitian-tor.yml | 50 ++++++++++++++++++++--------- gitian/mkbundle-windows.sh | 7 ++-- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 9d6838c..601dc4e 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -65,20 +65,38 @@ script: | fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src - # Let's avoid the console window popping up. - export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" - export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs" - ./autogen.sh - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - ./configure --disable-asciidoc --host=i686-w64-mingw32 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/ - make $MAKEOPTS - make install - cd .. - install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ - cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ - cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/ + # We are building normal bundles without the console popping up and expert + # ones with. See bug 13819 for the request and details. + mkdir build + BUILDS="normal expert" + for BUILD in $BUILDS + do + if [ "$BUILD" == "expert" ] + then + FLAG="" + BUNDLE="expert-" + else + FLAG="-mwindows" + BUNDLE="" + fi + export CFLAGS="$FLAG -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" + export LDFLAGS="$FLAG -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs" + ./autogen.sh + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + cd build + ../configure --disable-asciidoc --host=i686-w64-mingw32 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/ + make $MAKEOPTS + make install + cd ../.. + install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ + cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ + cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/ - # Grabbing the result - cd $INSTDIR - ~/build/dzip.sh tor-win32-gbuilt.zip Tor/ Data/ - cp tor-win32-gbuilt.zip $OUTDIR/ + # Grabbing the result + cd $INSTDIR + ~/build/dzip.sh tor-win32-${BUNDLE}gbuilt.zip Tor/ Data/ + cp tor-win32-${BUNDLE}gbuilt.zip $OUTDIR/ + cd ~/build/tor + # Remove artifacts of the previous build + rm -rf build/* + done diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 8f89123..6aeec8a 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -148,7 +148,8 @@ else cd .. fi -if [ ! -f inputs/tor-win32-gbuilt.zip ]; +if [ ! -f inputs/tor-win32-gbuilt.zip -o \ + ! -f inputs/tor-win32-expert-gbuilt.zip ]; then echo echo "****** Starting Tor Component of Windows Bundle (2/5 for Windows) ******" @@ -161,7 +162,7 @@ then exit 1 fi - cp -a build/out/tor-win32-gbuilt.zip inputs/ + cp -a build/out/tor-win32-*gbuilt.zip inputs/ #cp -a result/tor-windows-res.yml inputs/ else echo @@ -230,7 +231,7 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 - cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 + cp -a inputs/tor-win32-expert-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 touch inputs/bundle-windows.gbuilt else echo

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 24 Nov '15

24 Nov '15

commit 083a9e81e261ed2051577c8d425c082110999825 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 24 10:46:38 2015 +0000 Update translations for tails-openpgp-applet --- hu/openpgp-applet.pot | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hu/openpgp-applet.pot b/hu/openpgp-applet.pot index 8a0ccf0..74b7c3d 100644 --- a/hu/openpgp-applet.pot +++ b/hu/openpgp-applet.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# benewfy <benewfy(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2015-11-23 02:23+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2015-11-24 10:24+0000\n" +"Last-Translator: benewfy <benewfy(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,8 +93,8 @@ msgstr "Ujjlenyomat:" #: bin/openpgp-applet:447 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Felhasználó ID:" +msgstr[1] "Felhasználó ID-k:" #: bin/openpgp-applet:476 msgid "None (Don't sign)" @@ -128,14 +129,14 @@ msgstr "Megbízik ebben a kulcsban?" #: bin/openpgp-applet:603 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "A következő, kiválasztott kulcs nem teljesen megbízható:" +msgstr[1] "A következő, kiválasztott kulcsok nem teljesen megbízhatók:" #: bin/openpgp-applet:621 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Eléggé megbízik ebben a kulcsban, hogy mindenképpen használja?" +msgstr[1] "Eléggé megbízik ezekben a kulcsokban, hogy mindenképpen használja őket?" #: bin/openpgp-applet:634 msgid "No keys selected"

1 0

[webwml/staging] Merge remote-tracking branch 'isa/test'
by mikeperry＠torproject.org 24 Nov '15

24 Nov '15

commit f936d0b593d3b81d0298b7e97eb6531e53ff709e Merge: 9944a0e 86e6088 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 23 23:37:20 2015 -0800 Merge remote-tracking branch 'isa/test' 07:28 <+mikeperry> fuck waiting. its only europe yeah, I said that. .htaccess | 8 + README.md | 1 + css/bootstrap.css | 6027 ++++++++++++++++++++++++++++++++++++ donate/en/campaign-swag.wml | 84 + donate/en/donate-amazon.wml | 42 + donate/en/donate-options.wml | 28 - donate/en/donate.wml | 205 +- donate/en/donor-faq.wml | 202 ++ donate/en/donor-privacy-policy.wml | 29 + en/navigation.wmi | 2 +- getinvolved/en/tshirt.wml | 3 +- images/campaign-hoody.jpg | Bin 0 -> 55689 bytes images/campaign-t-shirt-1.jpg | Bin 0 -> 44107 bytes images/campaign-t-shirt-2.jpg | Bin 0 -> 50638 bytes images/cory-doctorow.jpg | Bin 0 -> 15747 bytes images/laura_poitras.jpg | Bin 0 -> 31763 bytes images/sticker-pack.jpg | Bin 0 -> 42540 bytes include/donatefoot.wmi | 10 + include/donatehead.wmi | 117 +- 19 files changed, 6538 insertions(+), 220 deletions(-)

1 0

[webwml/staging] Have the website admit that 0.2.7.5 is stable
by mikeperry＠torproject.org 24 Nov '15

24 Nov '15

commit 9944a0e37db47dcf39d752beacb3c0820095c17d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 22 20:39:21 2015 -0500 Have the website admit that 0.2.7.5 is stable --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 16a3328..7897228 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.2.6.10 -export DEVTAG=tor-0.2.7.4-rc +export DEVTAG=tor-0.2.7.5 WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index 7a22419..e05d00c 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.6.10</define-tag> -<define-tag version-alpha whitespace=delete>0.2.7.4-rc</define-tag> +<define-tag version-alpha whitespace=delete>0.2.7.5</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.6.10</define-tag>

1 0

[webwml/master] Adding swag page, update tshirt page and small changes to the other pages.
by mikeperry＠torproject.org 24 Nov '15

24 Nov '15

commit 86e6088dfddb7c7ef6c41ee79c5c124603e88869 Author: toya <toya(a)muamba.muamba> Date: Mon Nov 23 22:35:18 2015 -0800 Adding swag page, update tshirt page and small changes to the other pages. --- donate/en/campaign-swag.wml | 84 ++++++++++++++++++++++++++++++++++++ donate/en/donate.wml | 8 ++-- donate/en/donor-faq.wml | 13 ++++-- donate/en/donor-privacy-policy.wml | 4 +- getinvolved/en/tshirt.wml | 3 +- images/campaign-hoody.jpg | Bin 0 -> 55689 bytes images/campaign-t-shirt-1.jpg | Bin 0 -> 44107 bytes images/campaign-t-shirt-2.jpg | Bin 0 -> 50638 bytes images/sticker-pack.jpg | Bin 0 -> 42540 bytes 9 files changed, 100 insertions(+), 12 deletions(-) diff --git a/donate/en/campaign-swag.wml b/donate/en/campaign-swag.wml new file mode 100644 index 0000000..43969e9 --- /dev/null +++ b/donate/en/campaign-swag.wml @@ -0,0 +1,84 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 3-low + +#include "donatehead.wmi" TITLE="Donate to keep Tor alive!" CHARSET="UTF-8" + +<div class="donation"> + <div class="container text-justify"> + <div class="col-md-12 col-md-offset-0"> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + </div> + <div class="col-md-12"> + <h1>Thank you for your donation!</h1> + <div class="table-responsive"> + <table class="table"> + <tr> + <td><h3>$23+ donation is eligible for a sticker pack.</h3></td> + <td><a href="$(IMGROOT)/sticker-pack.jpg"><img src="$(IMGROOT)/sticker-pack.jpg"></a><p>You will receive an assortment of Tor stickers plus our exclusive "Tor Supporter" sticker. Display with pride! :)</p></td> + </tr> + <tr> + <td colspan="2" class="active"> + <h3>$100+ donation is eligible for 1 t-shirt. Select your style and size.</h4> + <p>Both T-shirts are:<br /> + <ul> + <li>100% pre-shrunk organic cotton</li> + <li>Water-based silk screen print</li> + <li>Made fairly</li> + <li>Certification: GOTS</li> + </ul> + </p> + </td> + </tr> + <tr> + <td> + <a href="$(IMGROOT)/campaign-t-shirt-1.jpg"><img src="$(IMGROOT)/campaign-t-shirt-1.jpg"></a> + <p><strong>T-Shirt Design Option #1</strong></p> + <p>(Limited Edition and exclusive to this campaign!)<br /> + <strong>THIS IS WHAT A TOR SUPPORTER LOOKS LIKE</strong></p> + <p>Color: Black <br /> + Sizes available: <br /> + Men S, M, L, XL, XXL <br /> + Women S, M, L</p> + </td> + <td> + <a href="$(IMGROOT)/campaign-t-shirt-2.jpg"><img src="$(IMGROOT)/campaign-t-shirt-2.jpg"></a> + <p><strong>T-Shirt Design Option #2</strong></p> + <strong>ROOTS</strong></p> + <p>Color: Black <br /> + Sizes available: <br /> + Men S, M, L, XL, XXL <br /> + Women S, M, L</p> + </td> + </tr> + <tr class="active"> + <td><h3>$500+ donation is eligible for 1 hooded sweatshirt.</h3> + <p>Hooded sweatshirts are: + <ul> + <li>100% pre-shrunk organic cotton</li> + <li>Water-based silk screen print</li> + <li>Made fairly</li> + <li>Certification: GOTS</li> + </ul> + </p> + </td> + <td><a href="$(IMGROOT)/campaign-hoody.jpg"><img src="$(IMGROOT)/campaign-hoody.jpg"></a> + <h4>Select your size.</h4> + <p><strong>Hoodie Design #1 (Limited Edition!)</strong><br /> + <strong>ROOTS</strong></p> + <p>Color: Black <br /> + Sizes available: <br /> + Men S, M, L, XL, XXL <br /> + Women S, M, L</p> + </td> + </tr> + </table> + </div> + <div class="col-md-12 col-md-offset-0"> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + </div> + </div> + </div> +</div> + +#include <donatefoot.wmi> diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 54d39e3..e3381b6 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -29,10 +29,10 @@ <div style="margin-top:20px;" class="btn-group btn-group-lg" role="group"> <div style="padding-bottom:5px;" class="col-md-4"><button id="amount1" name="amnt" type="button" class="btn btn-default btn-lg btn-block">10</button></div> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount2" name="amnt" type="button" class="btn btn-default btn-lg btn-block active" data-toggle="tooltip" data-placement="bottom" title="For this amount you get a tshirt!">100</button></div> - <div style="padding-bottom:5px;" class="col-md-4" ><button id="amount3" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="For this amount you get a tshirt!">256</button></div> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount4" name="amnt" type="button" class="btn btn-default btn-lg btn-block">50</button></div> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount5" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="For this amount you get a tshirt!">500</button></div> + <div style="padding-bottom:5px;" class="col-md-4"><button id="amount2" name="amnt" type="button" class="btn btn-default btn-lg btn-block active" data-toggle="tooltip" data-placement="bottom" title="You get a tshirt!">100</button></div> + <div style="padding-bottom:5px;" class="col-md-4" ><button id="amount3" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="You get a tshirt!">256</button></div> + <div style="padding-bottom:5px;" class="col-md-4"><button id="amount4" name="amnt" type="button" class="btn btn-default btn-lg btn-block" title="You get a sticker!">23</button></div> + <div style="padding-bottom:5px;" class="col-md-4"><button id="amount5" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="You get a hoody!">500</button></div> <div class="row form-group-lg"> <label class="sr-only" for="exampleInputAmount">1</label> <div class="input-group"> diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml index 950cd76..2fff4ab 100644 --- a/donate/en/donor-faq.wml +++ b/donate/en/donor-faq.wml @@ -7,7 +7,7 @@ <div class="container"> <div class="row text-justify"> <div class="col-md-12 col-md-offset-0"> - <a href="donate.html.en" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> </div> <div class="col-md-12 col-md-offset-0"> <h2 style="padding:2px; margin-bottom:10px;" class="text-justify">Donor FAQ</h2> @@ -18,7 +18,7 @@ </li> <li> <p><strong>Who works for the Tor Project, and what do they do?</strong></p> - <p>Thousands of people around the world actively support the work of the Tor Project, including developers, designers, relay operators, researchers, cryptographers, computer scientists, and privacy advocates. Most are not paid by the Tor Project; even our very small staff includes many volunteers. You can read about the core contributors to the Tor Project on our <a href="https://www.torproject.org/about/corepeople.html.en" target="_blank">Core People page</a>.</p> + <p>Thousands people around the world actively support the work of the Tor Project, including developers, designers, relay operators, researchers, cryptographers, computer scientists, and privacy advocates, and most are not paid by the Tor Project. The paid staff of the Tor Project is very small: about 20 people in total. You can read about the core contributors to the Tor Project on our <a href="https://www.torproject.org/about/corepeople.html.en" target="_blank">Core People page</a>.</p> </li> <li> <p><strong>Who uses Tor?</strong></p> @@ -78,7 +78,12 @@ </li> <li> <p><strong>Can I donate while using the Tor browser?</strong></p> - <p>Maybe! In our testing, some people had no problem donating via PayPal while using the Tor browser. But, some people couldn't complete the donation process, and one person had their PayPal account temporarily frozen. We recommend not using the Tor browser to donate via PayPal unless you're willing to risk some difficulties with PayPal.</p> + <p>Maybe! In our testing, we saw two scenarios related to Paypal + Tor browser:<br /> + <ol> + <li>Sometimes you get an error after clicking on the 'Donate' button. If this is happening to you, you should change your circuit and try again.</li> + <li>For users logging in to Paypal: some people had no problem donating via PayPal while using the Tor browser. But, some people couldn't complete the donation process, and one person had their PayPal account temporarily frozen. We recommend not using the Tor browser to donate using your PayPal account, unless you're willing to risk some difficulties with PayPal. + </li> + </ol></p> </li> <li> <p><strong>How can I donate via debit or credit card?</strong></p> @@ -187,7 +192,7 @@ </ol> </div> <div class="col-md-12 col-md-offset-0"> - <a href="donate.html.en" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> </div>  <div class="clearfix visible-xs-block"></div> diff --git a/donate/en/donor-privacy-policy.wml b/donate/en/donor-privacy-policy.wml index 0e5cc16..0f1f0bc 100644 --- a/donate/en/donor-privacy-policy.wml +++ b/donate/en/donor-privacy-policy.wml @@ -7,7 +7,7 @@ <div class="container"> <div class="row text-justify"> <div class="col-md-12 col-md-offset-0"> - <a href="donate.html.en" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> </div> <div class="col-md-12 col-md-offset-0"> <h2 style="padding:2px; margin-bottom:10px;">Donor Privacy Policy</h2> @@ -19,7 +19,7 @@ <p><strong>The Tor Project very much appreciates all its donors. Thank you for supporting Tor.</strong></p> </div> <div class="col-md-12 col-md-offset-0"> - <a href="donate.html.en" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> </div>  <div class="clearfix visible-xs-block"></div> diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index 0198d0d..e729d24 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -17,8 +17,7 @@ Tor project. There are three primary ways of contributing:</p> <ol> - <li>A large enough ($65+) <a href="<page - donate/donate>">donation</a> to the Tor Project.</li> + <li>During our end-of-the-year (2015) fundraising campaign, you can get a special, campaign t-shirt or other <a href="<page donate/campaign-swag>">cool swag</a> by <a href="<page donate/donate>">donating</a> to the Tor Project.</li> <li>Operate a fast <a href="<page docs/tor-doc-relay>">Tor relay</a> that's been running for the past two months: you are eligible if you allow exits to port 80 and you average 250 KBytes/s traffic, or if you're diff --git a/images/campaign-hoody.jpg b/images/campaign-hoody.jpg new file mode 100644 index 0000000..71f4bcf Binary files /dev/null and b/images/campaign-hoody.jpg differ diff --git a/images/campaign-t-shirt-1.jpg b/images/campaign-t-shirt-1.jpg new file mode 100644 index 0000000..406f237 Binary files /dev/null and b/images/campaign-t-shirt-1.jpg differ diff --git a/images/campaign-t-shirt-2.jpg b/images/campaign-t-shirt-2.jpg new file mode 100644 index 0000000..55458b1 Binary files /dev/null and b/images/campaign-t-shirt-2.jpg differ diff --git a/images/sticker-pack.jpg b/images/sticker-pack.jpg new file mode 100644 index 0000000..93f2a02 Binary files /dev/null and b/images/sticker-pack.jpg differ

1 0

[webwml/master] Merge remote-tracking branch 'isa/test'
by mikeperry＠torproject.org 24 Nov '15

24 Nov '15

commit f936d0b593d3b81d0298b7e97eb6531e53ff709e Merge: 9944a0e 86e6088 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 23 23:37:20 2015 -0800 Merge remote-tracking branch 'isa/test' 07:28 <+mikeperry> fuck waiting. its only europe yeah, I said that. .htaccess | 8 + README.md | 1 + css/bootstrap.css | 6027 ++++++++++++++++++++++++++++++++++++ donate/en/campaign-swag.wml | 84 + donate/en/donate-amazon.wml | 42 + donate/en/donate-options.wml | 28 - donate/en/donate.wml | 205 +- donate/en/donor-faq.wml | 202 ++ donate/en/donor-privacy-policy.wml | 29 + en/navigation.wmi | 2 +- getinvolved/en/tshirt.wml | 3 +- images/campaign-hoody.jpg | Bin 0 -> 55689 bytes images/campaign-t-shirt-1.jpg | Bin 0 -> 44107 bytes images/campaign-t-shirt-2.jpg | Bin 0 -> 50638 bytes images/cory-doctorow.jpg | Bin 0 -> 15747 bytes images/laura_poitras.jpg | Bin 0 -> 31763 bytes images/sticker-pack.jpg | Bin 0 -> 42540 bytes include/donatefoot.wmi | 10 + include/donatehead.wmi | 117 +- 19 files changed, 6538 insertions(+), 220 deletions(-)

1 0

[webwml/master] Try the donation redirect hack
by mikeperry＠torproject.org 24 Nov '15

24 Nov '15

commit 1c3f8602692fd0baea1b335c83b3a0b31ce255df Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 20 17:13:31 2015 +0100 Try the donation redirect hack --- .htaccess | 7 +++++++ en/navigation.wmi | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 6cdca66..1b40159 100644 --- a/.htaccess +++ b/.htaccess @@ -50,3 +50,10 @@ RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L] # Relays RewriteRule ^relays(.*) /getinvolved/relays [R=301,L] + +# Donation campagin +RewriteRule ^donate-twitter(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate-hp(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate-tbb(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate-banner(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate-download(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-banner.wml b/donate/en/donate-banner.wml new file mode 100644 index 0000000..e69de29 diff --git a/donate/en/donate-download.wml b/donate/en/donate-download.wml new file mode 100644 index 0000000..e69de29 diff --git a/donate/en/donate-hp.wml b/donate/en/donate-hp.wml new file mode 100644 index 0000000..e69de29 diff --git a/donate/en/donate-tbb.wml b/donate/en/donate-tbb.wml new file mode 100644 index 0000000..e69de29 diff --git a/donate/en/donate-twitter.wml b/donate/en/donate-twitter.wml new file mode 100644 index 0000000..e69de29 diff --git a/en/navigation.wmi b/en/navigation.wmi index ce8b001..504f29d 100644 --- a/en/navigation.wmi +++ b/en/navigation.wmi @@ -22,7 +22,7 @@ my @calltoaction = ( 'download/download-easy' , 'Download', 'getinvolved/volunteer' , 'Volunteer', - 'donate/donate' , 'Donate', + 'donate/donate-button' , 'Donate', ); :>

1 0

[webwml/master] Fix donate redirect rules
by mikeperry＠torproject.org 24 Nov '15

24 Nov '15

commit ac94eb4d8356daf484b7f925cd2d5d7e2d472d7d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 20 17:42:16 2015 +0100 Fix donate redirect rules --- .htaccess | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.htaccess b/.htaccess index 1b40159..a051529 100644 --- a/.htaccess +++ b/.htaccess @@ -52,8 +52,9 @@ RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L] RewriteRule ^relays(.*) /getinvolved/relays [R=301,L] # Donation campagin -RewriteRule ^donate-twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate-hp(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate-tbb(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate-banner(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate-download(.*) /donate/donate$1 [R=302,L] +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] +RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L]

1 0