June 2014 - tor-commits - lists.torproject.org

[orbot/master] make sure transproxy is renabled when network returns
by n8fr8＠torproject.org 19 Jun '14

19 Jun '14

commit 298a01e5195e23ea6e82de44e32ec93d477c77b7 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 19 10:30:02 2014 -0400 make sure transproxy is renabled when network returns --- src/org/torproject/android/service/TorService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index cca714c..7830a68 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -240,8 +240,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - mNotifyBuilder.setTicker(""); - //mNotifyBuilder.setLights(Color.GREEN, 5000, 5000); + mNotifyBuilder.setTicker(null); //make sure to clear ticker } if (isOngoing) @@ -1809,8 +1808,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(context.getString(R.string.network_connectivity_is_good_waking_tor_up_)); showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor,prefPersistNotifications); - //if (mHasRoot && mEnableTransparentProxy) - //enableTransparentProxy(mTransProxyAll, mTransProxyTethering); + if (mHasRoot && mEnableTransparentProxy) + enableTransparentProxy(mTransProxyAll, mTransProxyTethering); } }

1 0

[orbot/master] update to 14.0.4.1
by n8fr8＠torproject.org 19 Jun '14

19 Jun '14

commit 7ec6de72e6106450bece838bd0fe0cca85cd0b3d Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 19 10:30:17 2014 -0400 update to 14.0.4.1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a18aee1..df8c135 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.4" - android:versionCode="106" + android:versionName="14.0.4.1" + android:versionCode="107" android:installLocation="auto" >

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 19 Jun '14

19 Jun '14

commit 85576df8dd3f0cb17bad81177abe91b16362e1f0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 19 11:15:12 2014 +0000 Update translations for torcheck_completed --- ru(a)petr1708/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru(a)petr1708/torcheck.po b/ru(a)petr1708/torcheck.po index 1707cfc..be742c0 100644 --- a/ru(a)petr1708/torcheck.po +++ b/ru(a)petr1708/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-19 06:39+0000\n" +"PO-Revision-Date: 2014-06-19 11:01+0000\n" "Last-Translator: slav\n" "Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 19 Jun '14

19 Jun '14

commit 0096e47aabc7cf92750d291054222e74f571c0b0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 19 11:15:10 2014 +0000 Update translations for torcheck --- ru(a)petr1708/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru(a)petr1708/torcheck.po b/ru(a)petr1708/torcheck.po index 1707cfc..be742c0 100644 --- a/ru(a)petr1708/torcheck.po +++ b/ru(a)petr1708/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-19 06:39+0000\n" +"PO-Revision-Date: 2014-06-19 11:01+0000\n" "Last-Translator: slav\n" "Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n" "MIME-Version: 1.0\n"

1 0

[meek/master] Update Tor Browser paths for #11641.
by dcf＠torproject.org 19 Jun '14

19 Jun '14

commit 178572f5f1bb52200fa4c45497298241a745d8af Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 14 13:18:28 2014 -0700 Update Tor Browser paths for #11641. --- meek-client-torbrowser/linux.go | 4 ++-- meek-client-torbrowser/mac.go | 2 +- meek-client-torbrowser/windows.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meek-client-torbrowser/linux.go b/meek-client-torbrowser/linux.go index 35fb748..7a85d82 100644 --- a/meek-client-torbrowser/linux.go +++ b/meek-client-torbrowser/linux.go @@ -6,6 +6,6 @@ package main const ( - firefoxPath = "Browser/firefox" - firefoxProfilePath = "Data/Browser/profile.meek-http-helper" + firefoxPath = "./firefox" + firefoxProfilePath = "TorBrowser/Data/Browser/profile.meek-http-helper" ) diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index 6e00d05..4b015df 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -9,6 +9,6 @@ const ( // The TorBrowser.app.meek-http-helper directory is a special case for // the mac bundle. It is a copy of TorBrowser.app that has a modified // Info.plist file so that it doesn't show a dock icon. - firefoxPath = "../Contents/MacOS/TorBrowser.app.meek-http-helper/Contents/MacOS/firefox" + firefoxPath = "../Data/TorBrowser.app.meek-http-helper/Contents/MacOS/firefox" firefoxProfilePath = "../Data/Browser/profile.meek-http-helper" ) diff --git a/meek-client-torbrowser/windows.go b/meek-client-torbrowser/windows.go index 3a68de7..cc69bec 100644 --- a/meek-client-torbrowser/windows.go +++ b/meek-client-torbrowser/windows.go @@ -6,6 +6,6 @@ package main const ( - firefoxPath = "Browser/firefox.exe" - firefoxProfilePath = "Data/Browser/profile.meek-http-helper" + firefoxPath = "./firefox.exe" + firefoxProfilePath = "TorBrowser/Data/Browser/profile.meek-http-helper" )

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 19 Jun '14

19 Jun '14

commit 830d01ac89f7516e736a6f7d0d6fab7df25941df Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 19 06:45:51 2014 +0000 Update translations for torbutton-torbuttondtd --- ru(a)petr1708/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru(a)petr1708/torbutton.dtd b/ru(a)petr1708/torbutton.dtd index 45eeccb..8a0a71c 100644 --- a/ru(a)petr1708/torbutton.dtd +++ b/ru(a)petr1708/torbutton.dtd @@ -98,7 +98,7 @@ <!ENTITY torbutton.prefs.block_links "Блокировать щелчки по ссылкамъ и перезагрузку страницъ изъ разныхъ режимовъ Tor (необязъ.)"> <!ENTITY torbutton.prefs.jar_certs "Хранить SSL сертификаты въ раздѣльныхъ jar-файлахъ для Tor/не-Tor (желательно)"> <!ENTITY torbutton.prefs.jar_ca_certs "Хранить CA сертификаты въ раздѣльныхъ jar-файлахъ для Tor/не-Tor (желательно)"> -<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> +<!ENTITY torbutton.prefs.locked_mode "Отключите кнопки и быстрыя клавиши чтобы избѣжать случайнаго переключенія. "> <!ENTITY torbutton.prefs.startup_state "При обычномъ запускѣ (безъ возстановленія сессіи), устанавливать состояніе Tor въ:"> <!ENTITY torbutton.prefs.shutdown_state "Выключеное состояніе"> <!ENTITY torbutton.prefs.startup "Запускъ">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 19 Jun '14

19 Jun '14

commit 2e0cd860a36f324504fb740ba0a5cd39b2ed450d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 19 06:45:15 2014 +0000 Update translations for torcheck_completed --- ru(a)petr1708/torcheck.po | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/ru(a)petr1708/torcheck.po b/ru(a)petr1708/torcheck.po new file mode 100644 index 0000000..1707cfc --- /dev/null +++ b/ru(a)petr1708/torcheck.po @@ -0,0 +1,103 @@ +# TorCheck gettext template +# Copyright (C) 2008-2013 The Tor Project, Inc +# +# Translators: +# slav, 2014 +# Den Arefyev <>, 2012 +# mendov <mr.mendov(a)gmail.com>, 2013 +# Oul Gocke <beandonlybe(a)yandex.ru>, 2014 +# pavelzinovkin <pavel.zinovkin(a)gmail.com>, 2012 +# RK2 <nord115(a)mail.ru>, 2011 +# Sergey Briskin <sergey.briskin(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2014-06-19 06:39+0000\n" +"Last-Translator: slav\n" +"Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: ru@petr1708\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +msgid "Congratulations. This browser is configured to use Tor." +msgstr "Поздравляемъ. Вашъ браузеръ используетъ Tor." + +msgid "" +"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "Обращайтесь къ <a href=\"https://www.torproject.org/\">сѣтевому узлу Тора</a> за дополнительными данными о томъ какъ безопасно пользоваться Тором. Вы теперь можете анонимно обозрѣвать интернетъ. " + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "Доступно обновленіе безопасности для Tor Browser Bundle." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Нажмите здѣсь, чтобы сказать страницу</a>" + +msgid "Sorry. You are not using Tor." +msgstr "Увы. Въ данный моментъ вы не используете Tor." + +msgid "" +"If you are attempting to use a Tor client, please refer to the <a " +"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "Если вы собираетесь использовать Tor кліентъ, пожалуйста, зайдите на <a href=\"https://www.torproject.org/\">Tor сайтъ</a> и, въ частности <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">инструкціи по настройкѣ кліента Tor</a>." + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "Увы, не удалось обработать вашъ запросъ, или былъ полученъ неожиданный отвѣтъ сервера." + +msgid "" +"A temporary service outage prevents us from determining if your source IP " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "Временное отключеніе услугъ предотвращаетъ обнаруженіе, если Вашимъ исходнымъ IP адресомъ является <a href=\"https://www.torproject.org/\">Tor</a> узелъ." + +msgid "Your IP address appears to be: " +msgstr "Вашъ IP адресъ: " + +msgid "Are you using Tor?" +msgstr "Вы используете Tor?" + +msgid "This page is also available in the following languages:" +msgstr "Эта страница доступна на слѣдующихъ языкахъ:" + +msgid "For more information about this exit relay, see:" +msgstr "Для полученія дополнительной информаціи объ этомъ выходномъ узлѣ, смотрите" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "Проектъ Tor - это некоммерческая организація типа US 501(c)(3), предназначенная для изслѣдованія, развитія и образованія въ области сохраненія анонимности и личныхъ данныхъ." + +msgid "Learn More »" +msgstr "См. »" + +msgid "Go" +msgstr "Перейти" + +msgid "Short User Manual" +msgstr "Краткое руководство пользователя" + +msgid "Donate to Support Tor" +msgstr "Пожертвуйте на поддержку Tor" + +msgid "Tor Q&A Site" +msgstr "Сайтъ вопросовъ и отвѣтовъ Tor" + +msgid "Volunteer" +msgstr "Предложить помощь" + +msgid "JavaScript is enabled." +msgstr "JavaScript включенъ." + +msgid "JavaScript is disabled." +msgstr "JavaScript отключенъ." + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "Тѣмъ не менѣе, это не похоже на Tor Browser Bundle."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 19 Jun '14

19 Jun '14

commit f2a08b4fe0440273e4e5430dd9f1f4a176dc1495 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 19 06:45:10 2014 +0000 Update translations for torcheck --- ru(a)petr1708/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru(a)petr1708/torcheck.po b/ru(a)petr1708/torcheck.po index 9cf9a71..1707cfc 100644 --- a/ru(a)petr1708/torcheck.po +++ b/ru(a)petr1708/torcheck.po @@ -2,6 +2,7 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# slav, 2014 # Den Arefyev <>, 2012 # mendov <mr.mendov(a)gmail.com>, 2013 # Oul Gocke <beandonlybe(a)yandex.ru>, 2014 @@ -12,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-06 05:50+0000\n" +"PO-Revision-Date: 2014-06-19 06:39+0000\n" "Last-Translator: slav\n" "Language-Team: Russian Petrine orthography (http://www.transifex.com/projects/p/torproject/language/ru@petr1708/)\n" "MIME-Version: 1.0\n" @@ -29,7 +30,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Обращайтесь къ <a href=\"https://www.torproject.org/\">сѣтевому узлу Тора</a> за дополнительными данными о томъ какъ безопасно пользоваться Тором. Вы теперь можете анонимно обозрѣвать интернетъ. " msgid "There is a security update available for the Tor Browser Bundle." msgstr "Доступно обновленіе безопасности для Tor Browser Bundle." @@ -75,7 +76,7 @@ msgid "" msgstr "Проектъ Tor - это некоммерческая организація типа US 501(c)(3), предназначенная для изслѣдованія, развитія и образованія въ области сохраненія анонимности и личныхъ данныхъ." msgid "Learn More »" -msgstr "" +msgstr "См. »" msgid "Go" msgstr "Перейти"

1 0

[atlas/master] Fix Onionoo links
by karsten＠torproject.org 19 Jun '14

19 Jun '14

commit 156707f741e57c5afc42f60f74abd8b850b1b80a Author: Pablo Castellano <pablo(a)anche.no> Date: Thu Jun 19 00:45:33 2014 +0200 Fix Onionoo links --- templates/about.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/about.html b/templates/about.html index 73c378b..365b157 100644 --- a/templates/about.html +++ b/templates/about.html @@ -43,8 +43,8 @@ This means that the amount of requests made to the server can be minimized and t this application can potentially run by being loaded locally. The server is only interrogated for JSON objects that do not manipulate the DOM of the page. The protocol used for retrieving relay data is called Onionoo you can learn -<a href="https://www.torproject.org/projects/onionoo.html">more about Onionoo here</a> -and see <a href="https://onionoo.torproject.org/">the protocol details here</a>. +<a href="https://onionoo.torproject.org/">more about Onionoo here</a> +and see <a href="https://onionoo.torproject.org/protocol.html">the protocol details here</a>. </p> </div>

1 0

[tor-browser-bundle/master] Updating the README file.
by gk＠torproject.org 19 Jun '14

19 Jun '14

commit 881987bd6816d47da71e8a2065aedd36eafa87dd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 19 07:48:28 2014 +0000 Updating the README file. --- gitian/README.build | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 47a8f57..24a67a8 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -45,26 +45,37 @@ Detailed Explanation of Scripts: This directory is a wrapper around our modified version of Gitian, and has several helper scripts to make things easier. - 0. Makefile: The main Makefile. It has six main commands: + 0. Makefile: The main Makefile. It has the following commands: - prep: Check OS prerequisites and download source dependency inputs - build: Build localized bundles for Linux, Windows, and Mac - - clean: Remove prior partial build stages (see 'Partial Rebuilds' below) + - clean: Remove prior partial build stages (see 'Partial Rebuilds' below + for the usage of clean-* commands) - vmclean: Remove VM base images - distclean: Remove source dependency inputs, and run clean and vmclean - all: The default. It calls clean, prep, and then build. - sign: Signs your build output and uploads it to people.torproject.org - match: Checks your build output against public signed hashes To build beta/alpha/nightly bundles, alternate targets are provided: + - nightly: The equivalent to the 'all' rule for nightly packages + - alpha: The equivalent to the 'all' rule for alpha packages - beta: The equivalent to the 'all' rule for beta packages - - build-beta: The equivalent to the 'build' rule for beta packages + - prep-nightly: The equivalent to the 'prep' rule for nightly packages + - prep-alpha: The equivalent to the 'prep' rule for alpha packages - prep-beta: The equivalent to the 'prep' rule for beta packages - - sign-beta: Signs your build output and uploads it to people.torproject.org - - match-beta: Checks your build output against public signed hashes - + - build-nightly: The equivalent to the 'build' rule for nightly packages + - build-alpha: The equivalent to the 'build' rule for alpha packages + - build-beta: The equivalent to the 'build' rule for beta packages + - sign-nightly: The equivalent to the 'sign' rule for nightly packages + - sign-alpha: The equivalent to the 'sign' rule for alpha packages + - sign-beta: The equivalent to the 'sign' rule for beta packages + - match-nightly: The equivalent to the 'match' rule for nightly packages + - match-alpha: The equivalent to the 'match' rule for alpha packages + - match-beta: The equivalent to the 'match' rule for beta packages + 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. It is called by 'make prep'. - + 2. fetch-inputs.sh: This script fetches all of our source dependencies from the Internet and downloads them into ../../gitian-builder/inputs. After you run this script, you should be able to complete the rest of your @@ -76,17 +87,18 @@ Detailed Explanation of Scripts: 4. verify-tags.sh: This script verifies the signatures on git tags from the versions file. It is only run if VERIFY_TAGS is set in the versions file. - + 5. descriptors: In the descriptors directory, you will find the Gitian - descriptors for Linux, Windows, and Mac. There are three descriptors for - each platform: One to build Tor and its dependencies, one to build Firefox - and its dependencies, and one to bundle everything together. Each - descriptor is run from a fresh VM. - + descriptors for Linux, Windows, and Mac. There are five descriptors for + each platform: One to build the utilities needed by other descriptors, + one to build Tor, one to build Tor Browser, one to build the Pluggable + Transports and one to bundle everything together. Each descriptor is run + from a fresh VM. + 6. mkbundle-linux.sh: This script is a wrapper around Gitian's gbuild to call the appropriate descriptors to build 32 and 64 bit Linux bundle. It also will create build VM images for you if you haven't done that before. - + 7. mkbundle-windows.sh: This script is a wrapper around Gitian's gbuild to call the appropriate descriptors to build a Windows bundle. It also will create build VM images for you if you haven't done that before. @@ -98,7 +110,7 @@ Detailed Explanation of Scripts: 9. record-inputs.sh: This script records all of the hashes and bundle inputs for inclusion in the 'Docs/sources' subdirectory of the bundles themselves. - + 10. hash-bundles.sh: This script generates a 'sha256sums.txt' file in sorted, reproducible order. @@ -130,7 +142,7 @@ Partial Rebuilds: cleaned, and then re-package everything again as well. Note that if any of the source inputs, or the Ubuntu buildchain tools, or - the build tools' dependencies upgrade, your Tor and Firefox inputs will + the build tools' dependencies upgrade, your Tor and Tor Browser inputs will no longer match those produced by someone else's build from a fresh build that downloaded those newer input, dependency, and toolchain packages. @@ -187,7 +199,7 @@ Known Issues and Quirks: Diagnosing Problems: During a running build, you can tail logs in real time in - ../../gitian-builder/var/*.log + ../../gitian-builder/var/*.log Upon failure, logs of any failed component builds are relocated to ../../gitian-builder/*fail*.log. This is to prevent subsequent builds

1 0