- tor-commits - lists.torproject.org

r25060: {website} we do not need ar-se (website/trunk)
by Runa Sandvik 10 Sep '11

10 Sep '11

Author: runa Date: 2011-09-10 16:53:44 +0000 (Sat, 10 Sep 2011) New Revision: 25060 Modified: website/trunk/Makefile.common Log: we do not need ar-se Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-09-10 15:27:11 UTC (rev 25059) +++ website/trunk/Makefile.common 2011-09-10 16:53:44 UTC (rev 25060) @@ -18,7 +18,7 @@ -D STABLETAG=$(STABLETAG) #LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn -LANGS=ar ar-se bms cy da de en es et fa fi fr hu id it ja ko nl no pl pt pt-br ru se tr vn zh-cn +LANGS=ar bms cy da de en es et fa fi fr hu id it ja ko nl no pl pt pt-br ru se tr vn zh-cn WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS))) WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi ) @@ -35,9 +35,6 @@ %.html.ar: ar/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ -%.html.ar-se: ar-se/%.wml en/%.wml - lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ - %.html.bms: bms/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -127,13 +124,6 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile -.deps/%.html.ar-se.d: ar-se/%.wml .deps/.stamp - tmpfile=`mktemp -t tmp.XXXXXXX` \ - lang=`dirname $<` && \ - OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ - wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ - sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ - rm -f $$tmpfile .deps/%.html.bms.d: bms/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \

1 0

r25059: {website} update tbbs to 2.2.32-4 (website/trunk/include)
by Erinn Clark 10 Sep '11

10 Sep '11

Author: erinn Date: 2011-09-10 15:27:11 +0000 (Sat, 10 Sep 2011) New Revision: 25059 Modified: website/trunk/include/versions.wmi Log: update tbbs to 2.2.32-4 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-10 11:43:39 UTC (rev 25058) +++ website/trunk/include/versions.wmi 2011-09-10 15:27:11 UTC (rev 25059) @@ -23,7 +23,7 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.32</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.32-3</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.32-4</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>6.0.2</define-tag> @@ -33,15 +33,15 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.32-3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.32-3</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.32-4</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.32-4</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-0.9.8p</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>6.0.2</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>2.2.32-3</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>2.2.32-4</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>6.0.2</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.2</define-tag>

1 0

r25058: {website} be expliciter about google cache for tor mirrors page (website/trunk/docs/en)
by Roger Dingledine 10 Sep '11

10 Sep '11

Author: arma Date: 2011-09-10 11:43:39 +0000 (Sat, 10 Sep 2011) New Revision: 25058 Modified: website/trunk/docs/en/faq.wml Log: be expliciter about google cache for tor mirrors page Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-09-10 11:42:42 UTC (rev 25057) +++ website/trunk/docs/en/faq.wml 2011-09-10 11:43:39 UTC (rev 25058) @@ -655,7 +655,8 @@ Some government or corporate firewalls censor connections to Tor's website. In those cases, you have three options. First, get it from a friend — the <a href="<page projects/torbrowser>">Tor Browser -Bundle</a> fits nicely on a USB key. Second, find the google cache +Bundle</a> fits nicely on a USB key. Second, find the <a +href="https://encrypted.google.com/search?q=tor+mirrors">google cache</a> for the <a href="<page getinvolved/mirrors>">Tor mirrors</a> page and see if any of those copies of our website work for you. Third, you can download Tor via email: log in to your Gmail account and mail

1 0

r25057: {website} give a suggestion for where else to find tor (website/trunk/docs/en)
by Roger Dingledine 10 Sep '11

10 Sep '11

Author: arma Date: 2011-09-10 11:42:42 +0000 (Sat, 10 Sep 2011) New Revision: 25057 Modified: website/trunk/docs/en/verifying-signatures.wml Log: give a suggestion for where else to find tor Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2011-09-10 11:38:28 UTC (rev 25056) +++ website/trunk/docs/en/verifying-signatures.wml 2011-09-10 11:42:42 UTC (rev 25057) @@ -27,7 +27,8 @@ https part means there's encryption and authentication between your browser and the website, making it much harder for the attacker to modify your download. But it's not perfect. Some places in the - world block the Tor website, making users try somewhere else. Large + world block the Tor website, making users try <a href="<page + docs/faq>#GetTor">somewhere else</a>. Large companies sometimes force employees to use a modified browser, so the company can listen in on all their browsing. We've even <a href="https://blog.torproject.org/blog/diginotar-debacle-and-what-you-should-do-a…">seen</a>

1 0

r25056: {website} explain that linux users are winners (website/trunk/docs/en)
by Roger Dingledine 10 Sep '11

10 Sep '11

Author: arma Date: 2011-09-10 11:38:28 +0000 (Sat, 10 Sep 2011) New Revision: 25056 Modified: website/trunk/docs/en/verifying-signatures.wml Log: explain that linux users are winners Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2011-09-10 11:13:47 UTC (rev 25055) +++ website/trunk/docs/en/verifying-signatures.wml 2011-09-10 11:38:28 UTC (rev 25056) @@ -174,17 +174,22 @@ <h3>Linux</h3> <hr> - <p>For <b>RPM-based distributions</b> you can manually verify the - signatures on the RPM packages by:</p> - <pre>rpm -K filename.rpm</pre> + <p>Most Linux distributions come with gpg preinstalled, so users + who want to verify the Tor Browser Bundle for Linux (or the source + tarball) can just follow along with the instructions above for + "Mac OS X".</p> - <p>For <b>Debian</b>, you should read the instructions on <a - href="<page docs/debian>#packages">importing these keys to - apt</a>.</p> + <p>If you're using the <b>Debian</b> packages, you should read the + instructions on <a href="<page docs/debian>#packages">importing + these keys to apt</a>.</p> - <p>If you wish to learn more about GPG, see <a - href="http://www.gnupg.org/documentation/">http://www.gnupg.org/documentation/</a>.</p> + <p>If you're using the <b>RPMs</b>, you can manually verify the + signatures on the RPM packages by <pre>rpm -K filename.rpm</pre></p> + <p>See <a + href="http://www.gnupg.org/documentation/">http://www.gnupg.org/documentation/</a> + to learn more about GPG.</p> + </div>  <div id = "sidecol">

1 0

r25055: {website} link to the signing keys page and simplify the --verify line (website/trunk/docs/en)
by Roger Dingledine 10 Sep '11

10 Sep '11

Author: arma Date: 2011-09-10 11:13:47 +0000 (Sat, 10 Sep 2011) New Revision: 25055 Modified: website/trunk/docs/en/verifying-signatures.wml Log: link to the signing keys page and simplify the --verify line. i hope gpg works the same across platforms. Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2011-09-10 10:37:34 UTC (rev 25054) +++ website/trunk/docs/en/verifying-signatures.wml 2011-09-10 11:13:47 UTC (rev 25055) @@ -51,7 +51,9 @@ signatures. They allow you to verify the file you've downloaded is exactly the one that we intended you to get. For example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by - tor-browser-<version-torbrowserbundle>_en-US.exe.asc.</p> + tor-browser-<version-torbrowserbundle>_en-US.exe.asc. For a list + of which developer signs which package, see our <a href="<page + docs/signing-keys>">signing keys</a> page.</p> <h3>Windows</h3> <hr> @@ -91,7 +93,7 @@ to download the ".asc" file as well. Assuming you downloaded the package and its signature to your Desktop, run:</p> - <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --verify C:\Users\Alice\Desktop\<file-win32-bundle-stable>.asc C:\Users\Alice\Desktop\<file-win32-bundle-stable></pre> + <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --verify C:\Users\Alice\Desktop\<file-win32-bundle-stable>.asc</pre> <p>The output should say "Good signature": </p> @@ -147,7 +149,7 @@ to download the ".asc" file as well. Assuming you downloaded the package and its signature to your Desktop, run:</p> - <pre>gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice/<file-osx-x86-bundle-stable></pre> + <pre>gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc</pre> <p>The output should say "Good signature": </p>

1 0

r25054: {website} add some introduction paragraphs. we still need explain that (website/trunk/docs/en)
by Roger Dingledine 10 Sep '11

10 Sep '11

Author: arma Date: 2011-09-10 10:37:34 +0000 (Sat, 10 Sep 2011) New Revision: 25054 Modified: website/trunk/docs/en/verifying-signatures.wml Log: add some introduction paragraphs. we still need explain that fetching tbb, our sig, and our key from the same place is not going to do what you want. Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2011-09-10 10:36:09 UTC (rev 25053) +++ website/trunk/docs/en/verifying-signatures.wml 2011-09-10 10:37:34 UTC (rev 25054) @@ -12,6 +12,39 @@ <h1>How to verify signatures for packages</h1> <hr> + <h3>What is a signature and why should I check it?</h3> + <hr> + + <p>How do you know that the Tor program you have is really the + one we made? Many Tor users have very real adversaries who might + try to give them a fake version of Tor — and it doesn't matter + how secure and anonymous Tor is if you're not running the real Tor.</p> + + <p>An attacker could try a variety of attacks to get you to download + a fake Tor. For example, he could trick you into thinking some other + website is a great place to download Tor. That's why you should + always download Tor from <b>https</b>://www.torproject.org/. The + https part means there's encryption and authentication between your + browser and the website, making it much harder for the attacker + to modify your download. But it's not perfect. Some places in the + world block the Tor website, making users try somewhere else. Large + companies sometimes force employees to use a modified browser, + so the company can listen in on all their browsing. We've even <a + href="https://blog.torproject.org/blog/diginotar-debacle-and-what-you-should-do-a…">seen</a> + attackers who have the ability to trick your browser into thinking + you're talking to the Tor website with https when you're not.</p> + + <p>Some software sites list <a + href="http://en.wikipedia.org/wiki/Cryptographic_hash_function">sha1 + hashes</a> alongside the software on their website, so users can + verify that they downloaded the file without any errors. These + "checksums" help you answer the question "Did I download this file + correctly from whoever sent it to me?" They do a good job at making + sure you didn't have any random errors in your download, but they + don't help you figure out whether you were downloading it from the + attacker. The better question to answer is: "Is this file that I + just downloaded the file that Tor intended me to get?"</p> + <p>Each file on <a href="<page download/download>">our download page</a> is accompanied by a file with the same name as the package and the extension ".asc". These .asc files are GPG @@ -23,10 +56,9 @@ <h3>Windows</h3> <hr> - <p>You need to have GnuPG installed - before you can verify signatures. Go to <a - href="http://www.gnupg.org/download/">http://www.gnupg.org/download/</a> - and look for the "version compiled for MS-Windows" under "Binaries".</p> + <p>You need to have GnuPG installed before + you can verify signatures. Download it from <a + href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a>.</p> <p>Once it's installed, use GnuPG to import the key that signed your package. Since GnuPG for Windows is a command-line tool, you will need

1 0

r25053: {website} you don't have to mess with ulimit -n if you use the deb (website/trunk/docs/en)
by Roger Dingledine 10 Sep '11

10 Sep '11

Author: arma Date: 2011-09-10 10:36:09 +0000 (Sat, 10 Sep 2011) New Revision: 25053 Modified: website/trunk/docs/en/tor-doc-relay.wml Log: you don't have to mess with ulimit -n if you use the deb Modified: website/trunk/docs/en/tor-doc-relay.wml =================================================================== --- website/trunk/docs/en/tor-doc-relay.wml 2011-09-10 08:10:07 UTC (rev 25052) +++ website/trunk/docs/en/tor-doc-relay.wml 2011-09-10 10:36:09 UTC (rev 25053) @@ -259,7 +259,8 @@ Linux, you should add a line like "toruser hard nofile 8192" to your /etc/security/limits.conf file (where toruser is the user that runs the Tor process), and then restart Tor if it's installed as a package (or log - out and log back in if you run it yourself). + out and log back in if you run it yourself). The Debian/Ubuntu package + does this step for you. </p> <p>

1 0

[gettor/master] Add a hint on how to create the .pot file
by kaner＠torproject.org 10 Sep '11

10 Sep '11

commit ac7d4da047ca7d9a74fd9d63315770f3a406df3a Author: Christian Fromme <kaner(a)strace.org> Date: Sat Sep 10 11:56:08 2011 +0200 Add a hint on how to create the .pot file --- README.locale-spec-draft | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/README.locale-spec-draft b/README.locale-spec-draft index ade531a..c60a41a 100644 --- a/README.locale-spec-draft +++ b/README.locale-spec-draft @@ -33,6 +33,10 @@ This will allow the user to interact without any knowledge of locales. GENERATING .po/.pot FILES ------------------------- +In the top level directory of the gettor source, run the following command: + +xgettext lib/gettor/i18n.py -dgettor --from-code=utf-8 -o i18n/templates/gettor.pot + Don't worry about generating .po files anymore. All that's needed for Transifex to generate the .po files for us it to push the gettor .pot file to gettor.git's master branch.

1 0

r25052: {translation} This is the new torbutton , damnit. (translation/trunk/projects/torbutton/po/.tx)
by Mike Perry 10 Sep '11

10 Sep '11

Author: mikeperry Date: 2011-09-10 08:10:07 +0000 (Sat, 10 Sep 2011) New Revision: 25052 Modified: translation/trunk/projects/torbutton/po/.tx/config Log: This is the new torbutton , damnit. Modified: translation/trunk/projects/torbutton/po/.tx/config =================================================================== --- translation/trunk/projects/torbutton/po/.tx/config 2011-09-10 08:00:51 UTC (rev 25051) +++ translation/trunk/projects/torbutton/po/.tx/config 2011-09-10 08:10:07 UTC (rev 25052) @@ -1,12 +1,12 @@ [main] host = https://www.transifex.net -[torproject.3-torbutton-alpha-torbutton-properties-pot] +[torproject.3-torbutton-torbutton-properties-pot] file_filter = <lang>/torbutton.properties.po source_file = templates/torbutton.properties.pot source_lang = en -[torproject.3-torbutton-alpha-torbutton-dtd-pot] +[torproject.3-torbutton-torbutton-dtd-pot] file_filter = <lang>/torbutton.dtd.po source_file = templates/torbutton.dtd.pot source_lang = en

1 0