[tor-commits] [translation/support-portal] new translations in support-portal

[translation]

commit a3b49b67f8ac7114761dd7544813f8b2292ae830
Author: Translation commit bot 
Date:   Thu Dec 23 03:47:36 2021 +

new translations in support-portal
---
 contents+zh-TW.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index 94b94df63f..adceaeba91 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -14455,13 +14455,13 @@ msgstr "立刻捐款"
 #: lego/templates/navbar.html:96 templates/footer.html:13
 #: templates/footer.html:22 templates/navbar.html:96
 msgid "Download Tor Browser"
-msgstr "下載 Tor 瀏覽器"
+msgstr "下載洋蔥路由瀏覽器"
 
 #: lego/templates/footer.html:14 templates/footer.html:14
 msgid ""
 "Download Tor Browser to experience real private browsing without tracking, "
 "surveillance, or censorship."
-msgstr "下載 Tor 
瀏覽器，體驗真正沒有追蹤，監視或審查，完å…
¨ç§äººçš„網路瀏覽經驗。"
+msgstr 
"下載洋蔥路由瀏覽器，體驗真正沒有追蹤、監視或審查過濾，且完å
…¨ç§å¯†çš„網路瀏覽經驗。"
 
 #: lego/templates/footer.html:35 templates/footer.html:35
 msgid "Our mission:"
@@ -14550,7 +14550,7 @@ msgstr "而當這å…
©å€‹æŒ‰éˆ•éƒ½å‘ˆç¾ç°è‰²æ™‚，您則可以查看當這兩個
 #: lego/templates/secure-connections.html:65
 #: templates/secure-connections.html:15 templates/secure-connections.html:65
 msgid "Tor"
-msgstr "Tor"
+msgstr "洋蔥路由"
 
 #: lego/templates/secure-connections.html:32
 #: templates/secure-connections.html:32

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] new translations in tbmanual-contentspot

[translation]

commit c7fc61f597d6b6ab32cb25ff70946f58af157433
Author: Translation commit bot 
Date:   Thu Dec 23 03:46:45 2021 +

new translations in tbmanual-contentspot
---
 contents+zh-TW.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index f3c5069092..8c6bb95880 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -1484,9 +1484,9 @@ msgid ""
 "connections. Tor Browser will warn you that all activity and downloads will "
 "be stopped, so take this into account before clicking “New Identity”."
 msgstr ""
-"這項功能在您想要避å…
æ‚¨å¾ŒçºŒåœ¨ç€è¦½å™¨ä¸Šçš„活動記錄與您之前的活動記錄被關聯在一起時很有用。執行此功能將會關閉所有已經開啟的瀏覽器視窗、分é
 ä»¥åŠæ¸…除所有的瀏覽器"
-" cookie 
與歷史記錄等個人資訊，並且為後續所有的網路連線建立新的
 Tor 迴路。 Tor "
-"瀏覽器會å…
ˆæé†’您所有正在進行中的活動與下載都將會被終止，所以執行「新的識別身分」功能前請å
…ˆåšå¥½ç›¸é—œæº–備。"
+"當您希望後續在瀏覽器上的活動記錄與您之前的活動記錄不會被關聯在一起時，這個功能就很實用。執行此功能將會關閉所有已經開啟的瀏覽器視窗、分é
 ä»¥åŠæ¸…除所有的瀏覽器"
+" cookie "
+"與歷史記錄等個人資訊，並且為後續所有的網路連線建立新的洋蔥路由迴路。洋蔥路由瀏覽器會å
…
ˆæé†’您所有正在進行中的活動與下載都將會被終止，所以執行「新的識別身分」功能前請å
…ˆåšå¥½ç›¸é—œæº–備。"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -2867,7 +2867,7 @@ msgstr 
"普通安卓版的洋蔥路由瀏覽器比較穩定且較少發生錯誤
 msgid ""
 "Tor Browser for Android is available on Play Store, F-Droid and the Tor "
 "Project website."
-msgstr "安卓版的洋蔥路由瀏覽器可以從 Play Store、F-Droid 以及 
Tor專案的官方網站下載取得。"
+msgstr "安卓版的洋蔥路由瀏覽器可以從 Play Store、F-Droid 
以及洋蔥路由專案的官方網站下載取得。"
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)
@@ -3683,7 +3683,7 @@ msgid ""
 " routing, and is developed by someone who works closely with the Tor "
 "Project."
 msgstr ""
-"我們建議使用一個名為Onion 
Browser的iOS應用程式，這是一個使用洋蔥路由的開源應用程式，是由一位與Tor
 專案密切合作的夥伴所開發的。"
+"我們建議使用一個名為Onion 
Browser的iOS應用程式，這是一個使用洋蔥路由的開源應用程式，是由一位與洋蔥路由專案密切合作的夥伴所開發的。"
 
 #: https//tb-manual.torproject.org/mobile-tor/
 #: (content/mobile-tor/contents+en.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] new translations in support-portal

[translation]

commit 5aa43748123f7ac9d06521e540f4920d0cf8fd1b
Author: Translation commit bot 
Date:   Thu Dec 23 03:17:43 2021 +

new translations in support-portal
---
 contents+zh-TW.po | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index 8bb6994132..94b94df63f 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -48,7 +48,7 @@ msgstr "常見問題"
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "About Tor"
-msgstr "關於 Tor"
+msgstr "關於洋蔥路由"
 
 #: https//support.torproject.org/tbb/ (content/tbb/contents+en.lrtopic.title)
 #: https//support.torproject.org/glossary/tor-browser/
@@ -63,7 +63,7 @@ msgstr "洋蔥路由瀏覽器"
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "Tor Mobile"
-msgstr "Tor Mobile"
+msgstr "行動版洋蔥路由"
 
 #: https//support.torproject.org/connecting/
 #: (content/connecting/contents+en.lrtopic.title)
@@ -91,7 +91,7 @@ msgstr "HTTPS"
 #: https//support.torproject.org/relay-operators/
 #: (content/relay-operators/contents+en.lrtopic.title)
 msgid "Relay Operators"
-msgstr ""
+msgstr "中繼節點維護者"
 
 #: https//support.torproject.org/onionservices/
 #: (content/onionservices/contents+en.lrtopic.title)
@@ -112,34 +112,34 @@ msgstr "其他"
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "Get in Touch"
-msgstr ""
+msgstr "保持聯繫"
 
 #: https//support.torproject.org/apt/ (content/apt/contents+en.lrtopic.title)
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "Debian Repository"
-msgstr ""
+msgstr "Debian系統套件庫"
 
 #: https//support.torproject.org/rpm/ (content/rpm/contents+en.lrtopic.title)
 msgid "Tor rpm packages"
-msgstr ""
+msgstr "洋蔥路由RPM套件包"
 
 #: https//support.torproject.org/abuse/
 #: (content/abuse/contents+en.lrtopic.title)
 msgid "Abuse FAQ"
-msgstr ""
+msgstr "濫用問答集"
 
 #: https//support.torproject.org/metrics/
 #: (content/metrics/contents+en.lrtopic.title)
 #: https//support.torproject.org/glossary/metrics/
 #: (content/glossary/metrics/contents+en.lrword.term)
 msgid "Tor Metrics"
-msgstr ""
+msgstr "Tor Metrics"
 
 #: https//support.torproject.org/little-t-tor/
 #: (content/little-t-tor/contents+en.lrtopic.title)
 msgid "Little-t-tor"
-msgstr ""
+msgstr "Little-t-tor"
 
 #: https//support.torproject.org/alternate-designs/
 #: (content/alternate-designs/contents+en.lrtopic.title)
@@ -149,7 +149,7 @@ msgstr ""
 #: https//support.torproject.org/glossary/add-on-extension-or-plugin/
 #: (content/glossary/add-on-extension-or-plugin/contents+en.lrword.term)
 msgid "add-on, extension, or plugin"
-msgstr ""
+msgstr "擴充元件、延伸插件或外掛程式"
 
 #: https//support.torproject.org/glossary/add-on-extension-or-plugin/
 #: (content/glossary/add-on-extension-or-plugin/contents+en.lrword.definition)
@@ -175,7 +175,7 @@ msgstr ""
 #: https//support.torproject.org/glossary/antivirus-software/
 #: (content/glossary/antivirus-software/contents+en.lrword.term)
 msgid "antivirus software"
-msgstr ""
+msgstr "防毒軟體"
 
 #: https//support.torproject.org/glossary/antivirus-software/
 #: (content/glossary/antivirus-software/contents+en.lrword.definition)
@@ -189,7 +189,7 @@ msgstr "防毒軟體是用來é 
é˜²ã€åµæ¸¬å’Œç§»é™¤æƒ¡æ„è»Ÿé«”。"
 msgid ""
 "Antivirus software can interfere with [Tor](../tor-tor-network-core-tor) "
 "running on your computer."
-msgstr ""
+msgstr "您電è…
¦ä¸­çš„防毒軟體可能會干擾[洋蔥路由](../tor-tor-network-core-tor)。"
 
 #: https//support.torproject.org/glossary/antivirus-software/
 #: (content/glossary/antivirus-software/contents+en.lrword.definition)
@@ -5347,7 +5347,7 @@ msgstr "我的網路管理員會注意到我正在使用 
Tor 瀏覽器嗎？"
 #: https//support.torproject.org/tbb/tbb-38/
 #: (content/tbb/tbb-38/contents+en.lrquestion.description)
 msgid "When using Tor Browser, no one can see the websites that you visit."
-msgstr "使用 Tor 
瀏覽器時，沒有人可以看到您正在瀏覽的網站。"
+msgstr 
"使用洋蔥路由瀏覽器時，沒有人能看到您正在瀏覽哪個網站。"
 
 #: https//support.torproject.org/tbb/tbb-38/
 #: (content/tbb/tbb-38/contents+en.lrquestion.description)
@@ -7391,12 +7391,12 @@ msgstr ""
 msgid ""
 "When I'm using Tor, can eavesdroppers still see the information I share with"
 " websites, like login information and things I type into forms?"
-msgstr "當我使用 Tor 時，網路竊聽者能夠看到我和網站間å…
±äº«çš„資訊嗎？例如登錄資訊和我在表單中輸入的內容。"
+msgstr "當我使用洋蔥路由時，網路竊聽者能夠
看到我和網站間å…
±äº«çš„資訊嗎？例如登錄資訊和我在表單中輸入的內容。"
 
 #: 

[tor-commits] [translation/tpo-web] new translations in tpo-web

[translation]

commit 4909dc24b0f6f2d361c8c3a0fc8fd6ce9cb8841d
Author: Translation commit bot 
Date:   Thu Dec 23 03:17:38 2021 +

new translations in tpo-web
---
 contents+zh-TW.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index 9033fb8b97..26459c0ef1 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -1334,7 +1334,7 @@ msgstr ""
 
 #: (dynamic)
 msgid "Get in Touch"
-msgstr ""
+msgstr "保持聯繫"
 
 #: (dynamic)
 msgid "Back to previous page:"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor_outreach_md] new translations in tor_outreach_md

[translation]

commit a84b98838768c9058dac5f062f5118ad13b8f413
Author: Translation commit bot 
Date:   Thu Dec 23 03:17:34 2021 +

new translations in tor_outreach_md
---
 tor-outreach2019-2020-zh_TW.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-outreach2019-2020-zh_TW.md b/tor-outreach2019-2020-zh_TW.md
index f063d02b1e..80ae208ade 100644
--- a/tor-outreach2019-2020-zh_TW.md
+++ b/tor-outreach2019-2020-zh_TW.md
@@ -155,7 +155,7 @@ Tor 
社群受一套行為準則約束，而且在我們的社會契約中列出
 桌面版 Tor
 torproject.org/download
 ### 行動版 Tor
-Android 
+安卓版的洋蔥路由瀏覽器可以從 Google Play 下載。
 
 ### 從 GooglePlay 下載 Android 版本的 Tor 瀏覽器。
 iOS

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] new translations in tbmanual-contentspot

[translation]

commit eae6486103a085c1160e2f0dc6475506419802ed
Author: Translation commit bot 
Date:   Thu Dec 23 03:16:45 2021 +

new translations in tbmanual-contentspot
---
 contents+zh-TW.po | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/contents+zh-TW.po b/contents+zh-TW.po
index f4debfa505..f3c5069092 100644
--- a/contents+zh-TW.po
+++ b/contents+zh-TW.po
@@ -1449,7 +1449,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
 msgid "### CHANGING IDENTITIES AND CIRCUITS"
-msgstr "### 更換身份以及迴路"
+msgstr "### 更換識別身份以及迴路"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -3801,41 +3801,41 @@ msgstr "6. 
在安裝過程中，將洋蔥路由瀏覽器的安裝位置選擇指
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
 msgid "For macOS:"
-msgstr "適用於macOS"
+msgstr "在macOS系統上："
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
 msgid ""
 "1. Plug in your removable media and format it. You *must* use macOS Extended"
 " (Journaled) format."
-msgstr ""
+msgstr "1. 插入您的可移除式儲存裝置並執行æ 
¼å¼åŒ–，這裡您*必須要*使用macOS Extended(日誌型)檔案格式。"
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
 msgid "3. Download the macOS `.dmg` file and save it directly to your media."
-msgstr ""
+msgstr "3. 下載macOS的`.dmg`檔案並直接儲存進裝置中。"
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
 msgid ""
 "5. When the download is complete, click the `.dmg` file and begin the "
 "installation process."
-msgstr ""
+msgstr "5. 
下載完成後，點選開啟該`.dmg`檔案以開始安裝程序。"
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
 msgid "For GNU/Linux:"
-msgstr ""
+msgstr "在GNU/Linux系統上："
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
 msgid ""
 "3. Download the Linux `.tar.xz` file and save it directly to your media."
-msgstr ""
+msgstr "3. 下載Linux的`.tar.xz`檔案，並儲存至您的裝置中。"
 
 #: https//tb-manual.torproject.org/make-tor-portable/
 #: (content/make-tor-portable/contents+en.lrtopic.body)
 msgid ""
 "5. When the download is complete, extract the archive onto the media as "
 "well."
-msgstr ""
+msgstr "5. 下載完成後，將之解壓縮在該裝置中。"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/communitytpo-contentspot] new translations in communitytpo-contentspot

[translation]

commit b1fd18b8a253b8d47557aed2a5d6aa31d7c7f5d2
Author: Translation commit bot 
Date:   Thu Dec 23 00:15:09 2021 +

new translations in communitytpo-contentspot
---
 contents+ru.po | 34 +-
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/contents+ru.po b/contents+ru.po
index 963a89f8ee..8c21026884 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -1431,6 +1431,9 @@ msgid ""
 "are now sure that this descriptor could only be produced by that onion "
 "service and no one else."
 msgstr ""
+"Это обеспечивает _сквозную 
аутентификацию_ свойства безопасности, 
поскольку "
+"теперь мы уверены, что этот дескриптор 
может быть создан только этим onion-"
+"ресурс и никем другим."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1438,6 +1441,8 @@ msgid ""
 "And inside the descriptor, there are the introduction points that allow the "
 "client to introduce themselves to SecureDrop's onion service."
 msgstr ""
+"А внутри дескриптора есть точки входа, 
которые позволяют клиенту представить"
+" себя платформе SecureDrop onion-ресурса."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1449,7 +1454,7 @@ msgstr ""
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
 msgid "### Act 6: Where the client establishes a rendezvous point"
-msgstr ""
+msgstr "### Действие 6: Где клиент устанавливает 
точку встречи"
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1457,6 +1462,8 @@ msgid ""
 "Before the introduction takes place, the client (in this case, you) picks a "
 "Tor relay and establishes a circuit to it."
 msgstr ""
+"Перед введением клиент (в данном случае 
вы) выбирает узел Tor и "
+"устанавливает к нему подключение."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1464,6 +1471,8 @@ msgid ""
 "The client asks the relay to become their rendezvous point and give it an "
 "\"one-time secret\" that will be used as part of the rendezvous procedure."
 msgstr ""
+"Клиент просит узел стать его точкой 
встречи и передать ему \"одноразовый "
+"секрет\", который будет использоваться как 
часть процедуры встречи."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1475,7 +1484,7 @@ msgstr ""
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
 msgid "### Act 7: Where the onion service rendezvous with the client"
-msgstr ""
+msgstr "### Действие 7: Где onion-ресурс 
встречается с клиентом"
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1484,6 +1493,9 @@ msgid ""
 "address) on to the onion service, which runs multiple verification processes"
 " to decide whether you're trustworthy or not."
 msgstr ""
+"Входная точка передает ваши данные 
(секретную строку и адрес встречи) в "
+"onion-ресурс, который запускает несколько 
процессов проверки, чтобы решить, "
+"заслуживаете вы доверия или нет."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1495,7 +1507,7 @@ msgstr ""
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
 msgid "### Act 8: Where the rendezvous point verifies the client's secret"
-msgstr ""
+msgstr "### Действие 8: Где точка встречи 
проверяет секрет клиента"
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1503,6 +1515,8 @@ msgid ""
 "The onion service connects to the rendezvous point (through an anonymized "
 "circuit) and sends the \"one-time secret\" to it."
 msgstr ""
+"Onion-ресурс подключается к точке встречи 
(через анонимизированный канал) и "
+"отправляет ей 

[tor-commits] [translation/communitytpo-contentspot] new translations in communitytpo-contentspot

[translation]

commit 28405aef35e477e626492d31d982eb90fed552e6
Author: Translation commit bot 
Date:   Wed Dec 22 23:45:10 2021 +

new translations in communitytpo-contentspot
---
 contents+ru.po | 45 +
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/contents+ru.po b/contents+ru.po
index f76987e7b7..963a89f8ee 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -1229,6 +1229,9 @@ msgid ""
 "Let's imagine that your local newspaper decides to set up an onion service "
 "(using [SecureDrop](https://securedrop.org/)) to receive anonymous tips."
 msgstr ""
+"Давайте представим, что ваша местная 
газета решает настроить onion-ресурс "
+"(используя [SecureDrop](https://securedrop.org/)) для 
получения анонимных "
+"советов."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1237,6 +1240,9 @@ msgid ""
 " Tor relays and ask them to act as its _introduction points_ by establishing"
 " long-term circuits to them."
 msgstr ""
+"В качестве первого шага в протоколе 
onion-ресурс свяжется с группой узлов "
+"Tor и попросит их выступить в качестве 
_точек ввода_, установив для них "
+"долгосрочные связи."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1244,6 +1250,8 @@ msgid ""
 "These circuits are anonymized circuits, so the server does not reveal the "
 "service location to the introduction points."
 msgstr ""
+"Эти связи являются анонимными, поэтому 
сервер не раскрывает местоположение "
+"службы точкам ввода."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1252,6 +1260,9 @@ msgid ""
 "only allowing access through three introduction points that it connects to "
 "through a two-hop Tor circuit."
 msgstr ""
+"Onion-ресурс будет скрывать и защищать себя 
за сетью Tor, разрешая доступ "
+"только через три точки входа, к которым 
она подключается через схему Tor с "
+"двумя переходами."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1263,7 +1274,7 @@ msgstr ""
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
 msgid "### Act 2: Where the onion service publishes its descriptors"
-msgstr ""
+msgstr "### Действие 2: Где служба onion публикует 
свои дескрипторы"
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1271,6 +1282,8 @@ msgid ""
 "Now that the introduction points are set up, we need to create a way for "
 "clients to be able to find them."
 msgstr ""
+"Теперь, когда вводные пункты созданы, нам 
нужно создать способ, чтобы "
+"клиенты могли их найти."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1279,6 +1292,9 @@ msgid ""
 "containing a list of its introduction points (and \"authentication keys\"), "
 "and signs this descriptor with the onion service's _identity private key_."
 msgstr ""
+"По этой причине onion-ресурс собирает 
_дескриптор onion-ресурса_, содержащий"
+" список его точек входа (и \"ключи 
аутентификации\"), и подписывает этот "
+"дескриптор с помощью _приватного ключа 
идентификации_ onion-ресурса."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1286,6 +1302,8 @@ msgid ""
 "The _identity private key_ used here is the private part of the **public key"
 " that is encoded in the onion service address**."
 msgstr ""
+"_Приватный ключ идентификации_, 
используемый здесь, является закрытой 
частью"
+" **открытого ключа, который закодирован в 
адресе onion-ресурса**."
 
 #: https//community.torproject.org/onion-services/overview/
 #: (content/onion-services/overview/contents+en.lrpage.body)
@@ -1293,6 +1311,9 @@ msgid ""
 "The onion service upload that signed descriptor to a _distributed hash "
 "table_, which is part of 

[tor-commits] [translation/communitytpo-contentspot] new translations in communitytpo-contentspot

[translation]

commit c341b2a479268931178faa271741d8cb42d3825d
Author: Translation commit bot 
Date:   Wed Dec 22 23:15:10 2021 +

new translations in communitytpo-contentspot
---
 contents+ru.po | 58 ++
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/contents+ru.po b/contents+ru.po
index 17c7e3ed7b..f76987e7b7 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -429,16 +429,16 @@ msgstr ""
 #: (dynamic) https//community.torproject.org/outreach/meetup/
 #: (content/outreach/meetup/contents+en.lrpage.title)
 msgid "Organize a Tor meetup"
-msgstr ""
+msgstr "Организуйте Tor-встречу "
 
 #: (dynamic) https//community.torproject.org/outreach/meetup/
 #: (content/outreach/meetup/contents+en.lrpage.subtitle)
 msgid "Learn how to organize a Tor meetup with your friends."
-msgstr ""
+msgstr "Узнайте, как организовать Tor-встречу с 
друзьями."
 
 #: (dynamic)
 msgid "Tor Speakers Bureau"
-msgstr ""
+msgstr "Бюро Tor-докладчиков"
 
 #: (dynamic)
 msgid ""
@@ -447,10 +447,14 @@ msgid ""
 "speak...@torproject.org with your preferred topic, language requirement, "
 "date, and other details."
 msgstr ""
+"У нас есть специальная группа основных 
участников Tor, которые готовы "
+"выступить на вашем следующем мероприятии. 
Вы можете запросить докладчика, "
+"связавшись с speak...@torproject.org с вашей 
предпочтительной темой, "
+"языковыми требованиями, датой и другими 
деталями."
 
 #: (dynamic)
 msgid "Request a Speaker"
-msgstr ""
+msgstr "Запросить докладчика"
 
 #: (dynamic)
 msgid "Upcoming Tor Events"
@@ -580,10 +584,14 @@ msgid ""
 "an in-person training, we may still be able to help. Contact the community "
 "team and let's talk."
 msgstr ""
+"Вы заинтересованы в том, чтобы пригласить 
кого-то из Tor обучать вашу "
+"группу? Хотя мы получаем большое 
количество запросов на обучение и, "
+"возможно, не сможем предложить личное 
обучение, мы все равно можем помочь. "
+"Свяжитесь с командой сообщества и давайте 
обсудим."
 
 #: (dynamic)
 msgid "Community mailing list"
-msgstr ""
+msgstr "Список рассылки сообщества"
 
 #: https//community.torproject.org/training/
 #: (content/training/contents+en.lrpage.cta)
@@ -718,7 +726,7 @@ msgstr ""
 
 #: (dynamic)
 msgid "UX team mailing list"
-msgstr ""
+msgstr "Список рассылки UX team"
 
 #: https//community.torproject.org/user-research/
 #: (content/user-research/contents+en.lrpage.subtitle)
@@ -772,25 +780,27 @@ msgstr ""
 
 #: (dynamic)
 msgid "Connect with other Relay Operators"
-msgstr ""
+msgstr "Связь с другими операторами узлов"
 
 #: (dynamic)
 msgid ""
 "The best resource of all is the active community of relay operators on tor-"
 "relays mailing list and on IRC"
 msgstr ""
+"Лучший ресурс - это активное сообщество 
операторов узлов в списке рассылки "
+"tor-relays и в IRC."
 
 #: (dynamic)
 msgid "#tor-relays"
-msgstr ""
+msgstr "#tor-relays"
 
 #: (dynamic)
 msgid "in irc.oftc.net."
-msgstr ""
+msgstr "в irc.oftc.net."
 
 #: (dynamic)
 msgid "Relay Operators mailing list"
-msgstr ""
+msgstr "Список рассылки Relay Operators"
 
 #: https//community.torproject.org/relay/
 #: (content/relay/contents+en.lrpage.subtitle)
@@ -798,7 +808,7 @@ msgid ""
 "Relays are the backbone of the Tor network. Help make Tor stronger and "
 "faster by running a relay today."
 msgstr ""
-"Реле являются основой сети Tor. Помогите 
сделать Tor сильнее и быстрее, "
+"Узлы являются основой сети Tor. Помогите 
сделать Tor сильнее и быстрее, "
 "запустив ретранслятор сегодня."
 
 #: https//community.torproject.org/relay/
@@ -816,7 +826,7 @@ msgstr ""
 #: https//community.torproject.org/relay/
 #: (content/relay/contents+en.lrpage.body)
 msgid "The more people who run relays, the better the Tor network will be."
-msgstr "Чем больше людей запустит реле, тем 
лучше будет сеть Tor."
+msgstr "Чем больше людей запустит узлов, тем 
лучше будет сеть Tor."
 
 #: https//community.torproject.org/relay/
 #: (content/relay/contents+en.lrpage.body)
@@ -1124,7 +1134,7 @@ msgstr ""
 #: https//community.torproject.org/onion-services/overview/
 #: 

[tor-commits] [translation/communitytpo-contentspot] new translations in communitytpo-contentspot

[translation]

commit 8f4d7107d0480101694a6f21999d8a6220f62cc2
Author: Translation commit bot 
Date:   Wed Dec 22 22:45:08 2021 +

new translations in communitytpo-contentspot
---
 contents+ru.po | 26 ++
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/contents+ru.po b/contents+ru.po
index 17b0dc362f..17c7e3ed7b 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -7,7 +7,6 @@
 # Ziggi, 2021
 # Sergey Leschina , 2021
 # Vincent Breitmoser , 2021
-# Transifex Bot <>, 2021
 # Legenden Rifk , 2021
 # Иван Иванов , 2021
 # Giovanni Pellerano , 2021
@@ -49,7 +48,7 @@ msgstr "Наше сообщество состоит из 
правозащитн
 #: (dynamic) https//community.torproject.org/outreach/
 #: (content/outreach/contents+en.lrpage.section)
 msgid "community"
-msgstr "community"
+msgstr "Сообщество"
 
 #: https//community.torproject.org/ (content/contents+en.lrpage.body)
 msgid "The Tor community is made up of all kinds of contributors."
@@ -470,7 +469,7 @@ msgstr "Расскажите миру о Tor"
 #: https//community.torproject.org/outreach/
 #: (content/outreach/contents+en.lrpage.body)
 msgid "##Tell the world about Tor"
-msgstr "##Расскажите миру о Tor"
+msgstr "## Расскажите миру о Tor"
 
 #: https//community.torproject.org/outreach/
 #: (content/outreach/contents+en.lrpage.body)
@@ -487,11 +486,13 @@ msgid ""
 "We've curated some beautiful materials for sharing in-person and on social "
 "media we welcome you to use."
 msgstr ""
+"Мы подготовили несколько красивых 
материалов для личного обмена и в "
+"социальных сетях и  предлагаем вам их 
использовать."
 
 #: (dynamic) https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.title)
 msgid "Training Best Practices"
-msgstr ""
+msgstr "Лучшие практики обучения"
 
 #: (dynamic) https//community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lrpage.subtitle)
@@ -500,11 +501,14 @@ msgid ""
 "Good preparation is essential to an effective and safe training, so we've "
 "curated some resources to help you make the most of your training event."
 msgstr ""
+"Хорошая подготовка имеет важное значение 
для эффективного и безопасного "
+"обучения, поэтому мы подготовили ресурсы, 
которые помогут вам использовать "
+"по максимуму ваше обучающее мероприятие."
 
 #: (dynamic) https//community.torproject.org/training/checklist/
 #: (content/training/checklist/contents+en.lrpage.title)
 msgid "Training Checklist"
-msgstr ""
+msgstr "Чек-лист обучения"
 
 #: (dynamic) https//community.torproject.org/training/checklist/
 #: (content/training/checklist/contents+en.lrpage.subtitle)
@@ -512,6 +516,8 @@ msgid ""
 "Based on our best practices, we have a checklist to help you prepare to "
 "conduct your training."
 msgstr ""
+"Основываясь на наших лучших практиках, у 
нас есть чек-лист, который поможет "
+"вам подготовиться к проведению обучения."
 
 #: (dynamic) https//community.torproject.org/training/resources/
 #: (content/training/resources/contents+en.lrpage.title)
@@ -529,17 +535,17 @@ msgstr "Вы обучаете свое 
сообщество использова
 #: (dynamic) https//community.torproject.org/training/code-of-conduct/
 #: (content/training/code-of-conduct/contents+en.lrpage.title)
 msgid "Code of Conduct for Trainers"
-msgstr ""
+msgstr "Кодекс поведения наставников"
 
 #: (dynamic) https//community.torproject.org/training/code-of-conduct/
 #: (content/training/code-of-conduct/contents+en.lrpage.subtitle)
 msgid "Foster a safe, engaging environment."
-msgstr ""
+msgstr "Создайте безопасную, привлекательную 
среду."
 
 #: (dynamic) https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.title)
 msgid "Tor Training FAQ"
-msgstr ""
+msgstr "Tor Training FAQ"
 
 #: (dynamic) https//community.torproject.org/training/faq/
 #: (content/training/faq/contents+en.lrpage.subtitle)
@@ -547,6 +553,8 @@ msgid ""
 "People who are new to the Tor project, quite often, ask similar questions, "
 "and we can help you prepare for these questions."
 msgstr ""
+"Люди, которые являются новичками в 
проекте Tor, довольно часто задают "
+"типовые вопросы, и мы можем помочь вам 
подготовиться к ним."
 
 #: (dynamic) https//community.torproject.org/training/risks/
 #: 

[tor-commits] [orbot/master] update tor-android to 0.4.6.9

[n8fr8]

commit c208274e1a4c8a3e297be5664632b2235877227c
Author: n8fr8 
Date:   Wed Dec 22 10:04:15 2021 -0500

update tor-android to 0.4.6.9
---
 dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 4feeb6e5..1fce0233 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -22,7 +22,7 @@ ext {
 guardian_jtorctl : "0.4.5.7",
 ipt_proxy: "1.3.0",
 portmapper   : "2.0.5",
-tor_android  : "0.4.6.8"
+tor_android  : "0.4.6.9"
 ]
 
 libs = [



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update to 1652200300

[n8fr8]

commit 7b68f362fc60a2ccafb3744908752ed4a431dd32
Author: n8fr8 
Date:   Wed Dec 22 16:53:24 2021 -0500

update to 1652200300
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 40dce522..56fd89be 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,7 @@ android {
 minSdkVersion 16
 applicationId 'org.torproject.android'
 targetSdkVersion 29
-versionCode 1652200200
+versionCode 1652200300
 
 versionName getVersionName()
 archivesBaseName = "Orbot-$versionName"



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update changelog

[n8fr8]

commit 6643573104df605d849446a232fd9e1fa5dcb9b9
Author: n8fr8 
Date:   Wed Dec 22 16:54:23 2021 -0500

update changelog
---
 CHANGELOG | 75 +++
 1 file changed, 75 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e209b446..88bd2ce3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,78 @@
+/** 16.5.2-RC-3 22 Dec 2021 **/
+
+7b68f362 (HEAD -> master) update to 1652200300
+5a1e7a9c (origin/master, origin/HEAD) Merge branch 'master' of 
github.com:guardianproject/orbot
+f1f4750c Merge pull request #562 from guardianproject/empty_notification
+c208274e (origin/dev_fix_service_leak, dev_fix_service_leak) update 
tor-android to 0.4.6.9
+69429002 don't always send status with every log entry and update - also 
slightly change where "stopSelf()" is called in stopTor
+8e5dd0ff lower threshold for showing bandwidth to 0 as smaller bw events were 
being missed - data display looked like it was often inactive
+594f2976 need to differentiate OrbotService status messages from TorService as 
it was confusing OrbotMain - collision between status action namespace
+bb0531a0 don't always expect a status with every log update; clean up other UI 
handling of status and log
+5792d666 (origin/empty_notification) Fixes #398 empty notification
+f47aff18 unbinding from tor service will stop tor; don't need to use conn to 
do it - also removed old commented out code - also removed making conn and 
other vars null on service issues, not necessary
+06e2b8d4 Small bug with deleting unconfigured v3s
+da416283 conn may be null, but service may be bound, so make sure it is 
unbound here
+ec7200b7 (tag: 16.5.2-RC-2-tor.0.4.6.8) update to 1652200200
+c7200b7 (HEAD -> master) update to 1652200200
+816c5825 (origin/master, origin/HEAD) disable MOAT and Snowflake on SDK < 28 
since they don't currently work
+03470d46 simplify snowflake strings
+06851dd1 register local v3 name receiver
+9770ce87 removed new translations for strings that were removed from orbot
+b2001961 add comment about how snowlfake bridges may sometimes take a minute
+1ed8efd0 Merge pull request #558 from guardianproject/tor-android-0.4.6.8
+dd723e49 (tag: 16.5.2-RC-1-tor.0.4.6.8, ghdev/master) update to 1652200100
+0ef3500e handle new local action for v3 onion names updating; also don't allow 
rapid stop/starts to avoid crashes
+ac3d1baf move v3 onion name status to a "local action" instead
+1d47994f update tor to 0.4.6.8w
+5615b751 Merge pull request #542 from weblate/weblate-guardianproject-orbot
+172b0234 Merge branch 'master' into weblate-guardianproject-orbot
+65640ebb Merge branch 'external_app_request_v3'
+1682f7cb (external_app_request_v3) if someone stops during starting, conn 
could be null
+0e59b55c Merge branch 'master' into external_app_request_v3
+03ef5ef9 Merge branch 'ipt_1_3_0'
+06453716 (origin/tor-android-0.4.6.8, tor-android-0.4.6.8) tor-android 0.4.6.7 
-> 0.4.6.8
+d8f6ebb3 (origin/external_app_request_v3) fixed status bug reported in #556
+0c77144e (origin/ipt_1_3_0, ipt_1_3_0) add support for snowflake with amp 
rendezvous
+bdee3957 removed faulty bridge wizard from bridges page...paving the way to 
add a new bridge here...
+50ef12d3 Snowflake proxy uses defaults in IPtProxy, displays cute toast when 
user connects. activity text for snowflake proxy isn't in ALL CAPS anymore
+843effd9 Snowflake animations had a bug; they'd appear if tor connects and the 
pref is set to true even if proxy wasn't enabled (because bridges were...)
+0123927a Interface for #540
+798ef6eb Experimental show snowflake toast when client connects to proxy...
+c984dcc5 Closes #554, IPtProxy 1.3.0 added
+34f4de6d Merge pull request #551 from 
guardianproject/fix_549_no_snowflake_and_bridge_ui
+9cf66800 for now, disable snowflake proxy limiting
+1abfd73f Translated using Weblate (Vietnamese)
+3d8182ec Translated using Weblate (Chinese (Simplified))
+32753b41 Translated using Weblate (Ukrainian)
+2f23db85 Translated using Weblate (Turkish)
+41cf5d37 Translated using Weblate (Portuguese (Brazil))
+5bd6165d Translated using Weblate (Lithuanian)
+57f2f7fd Translated using Weblate (Persian)
+a8057ced Translated using Weblate (Vietnamese)
+171ceac1 Translated using Weblate (Indonesian)
+a1d04487 made setEnabled() call null safe
+3fbda179 removed unused v2 constant from OrbotService
+2637e1f0 return val of pluggableTransportsInstall always the same + never used
+2cc79c18 Fixes #549 snowflake preferences are greyed on when bridges are in 
use also added string res for snowflake proxy category so it can be localized
+f989be3e removed unused FileProvider.xml mentioned in #540
+afc97fe9 Update BUILD.md
+8e5cc3a7 Merge pull request #543 from tladesignz/master
+80e92e9d Fixed some random compiler warnings, while reading through the code.
+68b3104a Merge branch 'master' of gitlab.com:guardianproject/orbot
+84f0be7c (newport/master) Update .gitlab-ci.yml file
+c3b64f85 Update .gitlab-ci.yml file
+515d0e52 Merge branch 'master' 

[tor-commits] [orbot/master] lower threshold for showing bandwidth to 0 as smaller bw events were being missed

[n8fr8]

commit 8e5dd0ff976712c7612681d1f7f3408559717f3c
Author: n8fr8 
Date:   Wed Dec 22 10:03:07 2021 -0500

lower threshold for showing bandwidth to 0 as smaller bw events were being 
missed
- data display looked like it was often inactive
---
 .../src/main/java/org/torproject/android/service/TorEventHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
 
b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
index 0b49b461..9cc48499 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
@@ -16,7 +16,7 @@ import java.util.StringTokenizer;
  */
 public class TorEventHandler implements EventHandler, TorServiceConstants {
 
-private final static int BW_THRESDHOLD = 1;
+private final static int BW_THRESDHOLD = 0;
 private final OrbotService mService;
 private long lastRead = -1;
 private long lastWritten = -1;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] don't always send status with every log entry and update

[n8fr8]

commit 694290028484ec19df97893f5551737322d75deb
Author: n8fr8 
Date:   Wed Dec 22 10:03:55 2021 -0500

don't always send status with every log entry and update
- also slightly change where "stopSelf()" is called in stopTor
---
 .../org/torproject/android/service/OrbotService.java | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 234dcaf1..fc95fe59 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -293,17 +293,20 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 disableSnowflakeProxy();
 
 stopTor();
+sendCallbackStatus(STATUS_OFF);
 
 //stop the foreground priority and make sure to remove the 
persistent notification
 stopForeground(true);
 
 sendCallbackLogMessage(getString(R.string.status_disabled));
+
 } catch (Exception e) {
 logNotice("An error occurred stopping Tor: " + e.getMessage());
 sendCallbackLogMessage(getString(R.string.something_bad_happened));
 }
 clearNotifications();
-sendCallbackStatus(STATUS_OFF);
+
+stopSelf();
 }
 
 private void stopTorOnError(String message) {
@@ -414,7 +417,6 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 shouldUnbindTorService = false;
 }
 
-stopSelf();
 }
 
 private void requestTorRereadConfig() {
@@ -697,8 +699,6 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 sendCallbackStatus(STATUS_STARTING);
 
 showToolbarNotification(getString(R.string.status_starting_up), 
NOTIFY_ID, R.drawable.ic_stat_tor);
-//sendCallbackLogMessage(getString(R.string.status_starting_up));
-//logNotice(getString(R.string.status_starting_up));
 
 ArrayList customEnv = new ArrayList<>();
 
@@ -708,6 +708,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 }
 
 startTorService();
+
 if (Prefs.hostOnionServicesEnabled()) {
 try {
 updateV3OnionNames();
@@ -750,7 +751,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
  */
 String oldStatus = mCurrentStatus;
 Intent intent = new Intent(LOCAL_ACTION_V3_NAMES_UPDATED);
-intent.putExtra(EXTRA_STATUS, mCurrentStatus);
+//intent.putExtra(EXTRA_STATUS, mCurrentStatus);
 LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
 
 mCurrentStatus = oldStatus;
@@ -831,6 +832,9 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 public void onServiceDisconnected(ComponentName componentName) {
 if (Prefs.useDebugLogging())
 Log.d(OrbotConstants.TAG, "TorService: 
onServiceDisconnected");
+
+sendCallbackStatus(STATUS_OFF);
+
 }
 
 @Override
@@ -841,6 +845,9 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 @Override
 public void onBindingDied(ComponentName componentName) {
 Log.w(OrbotConstants.TAG, "TorService: onBindingDied");
+
+sendCallbackStatus(STATUS_OFF);
+
 }
 };
 
@@ -940,7 +947,6 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 intent.putExtra("totalRead", totalRead);
 intent.putExtra("lastWritten", lastWritten);
 intent.putExtra("lastRead", lastRead);
-intent.putExtra(EXTRA_STATUS, mCurrentStatus);
 
 LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
 }
@@ -949,8 +955,6 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 mHandler.post(() -> {
 Intent intent = new Intent(LOCAL_ACTION_LOG); // You can also 
include some extra data.
 intent.putExtra(LOCAL_EXTRA_LOG, logMessage);
-intent.putExtra(EXTRA_STATUS, mCurrentStatus);
-
 
LocalBroadcastManager.getInstance(OrbotService.this).sendBroadcast(intent);
 });
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] need to differentiate OrbotService status messages from TorService as it was confusing OrbotMain

[n8fr8]

commit 594f297657e086a4c85fe3b04cde1eeef9b5060b
Author: n8fr8 
Date:   Wed Dec 22 10:02:24 2021 -0500

need to differentiate OrbotService status messages from TorService as it 
was confusing OrbotMain
- collision between status action namespace
---
 .../main/java/org/torproject/android/service/TorServiceConstants.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
 
b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
index ea89dbb1..04ceb229 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
@@ -43,7 +43,7 @@ public interface TorServiceConstants {
 /**
  * {@link Intent} send by Orbot with {@code ON/OFF/STARTING/STOPPING} 
status
  */
-String ACTION_STATUS = "org.torproject.android.intent.action.STATUS";
+String ACTION_STATUS = "ORBOT.intent.action.STATUS";
 /**
  * {@code String} that contains a status constant: {@link #STATUS_ON},
  * {@link #STATUS_OFF}, {@link #STATUS_STARTING}, or



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Fixes #398 empty notification

[n8fr8]

commit 5792d666ff2ddd3da9200a15f27b24af66e22006
Author: b 
Date:   Tue Dec 21 18:18:25 2021 -0500

Fixes #398 empty notification
---
 .../src/main/java/org/torproject/android/service/OrbotService.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 5fd05409..222bf6f5 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -139,7 +139,6 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 private static String[] parseBridgesFromSettings(String bridgeList) {
 // this regex replaces lines that only contain whitespace with an 
empty String
 bridgeList = bridgeList.trim().replaceAll("(?m)^[ \t]*\r?\n", "");
-Log.d("bim", "bridgeList=" + bridgeList);
 return bridgeList.split("\\n");
 }
 
@@ -244,7 +243,8 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 }
 
 public int onStartCommand(Intent intent, int flags, int startId) {
-showToolbarNotification("", NOTIFY_ID, R.drawable.ic_stat_tor);
+if (!mNotificationShowing)
+showToolbarNotification(getString(R.string.status_disabled), 
NOTIFY_ID, R.drawable.ic_stat_tor);
 
 if (intent != null)
 mExecutor.execute(new IncomingIntentRouter(intent));



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update to 1652200100

[n8fr8]

commit dd723e49596e0e4d470573cf8b2324f3a0f51ec4
Author: n8fr8 
Date:   Mon Dec 20 14:57:33 2021 -0500

update to 1652200100
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0f5a8b21..44d7466e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,7 @@ android {
 minSdkVersion 16
 applicationId 'org.torproject.android'
 targetSdkVersion 29
-versionCode 1652100110
+versionCode 1652200100
 
 versionName getVersionName()
 archivesBaseName = "Orbot-$versionName"



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] handle new local action for v3 onion names updating;

[n8fr8]

commit 0ef3500ef9239e54b782c53efe643bf7a3bb1d3b
Author: n8fr8 
Date:   Mon Dec 20 14:55:34 2021 -0500

handle new local action for v3 onion names updating;
also don't allow rapid stop/starts to avoid crashes
---
 .../org/torproject/android/OrbotMainActivity.java  | 64 ++
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 2310b3b8..ba40d5c5 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -179,6 +179,26 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 
 break;
 }
+case TorServiceConstants.LOCAL_ACTION_V3_NAMES_UPDATED:
+if (lastInsertedOnionServiceRowId == -1) break; // another 
app did not request an onion service
+ContentResolver cr = getContentResolver();
+String where = 
OnionServiceContentProvider.OnionService._ID + "=" + 
lastInsertedOnionServiceRowId;
+Cursor v3Cursor = 
cr.query(OnionServiceContentProvider.CONTENT_URI, 
OnionServiceContentProvider.PROJECTION,
+where, null, null);
+if (v3Cursor == null || v3Cursor.getCount() != 1 || 
!v3Cursor.moveToFirst()) {
+if (v3Cursor != null) v3Cursor.close();
+OrbotMainActivity.this.setResult(RESULT_CANCELED);
+OrbotMainActivity.this.finish();
+return;
+}
+String hostname = 
v3Cursor.getString(v3Cursor.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN));
+v3Cursor.close();
+if (TextUtils.isEmpty(hostname)) break;
+Intent response = new Intent();
+response.putExtra(INTENT_EXTRA_REQUESTED_V3_HOSTNAME, 
hostname);
+OrbotMainActivity.this.setResult(RESULT_OK, response);
+OrbotMainActivity.this.finish();
+break;
 case TorServiceConstants.ACTION_STATUS: {
 lastStatusIntent = intent;
 
@@ -260,10 +280,29 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 startService(intent);
 }
 
+private boolean waitingToStop = false;
+
 private void stopTor() {
-if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN);
 
-sendIntentToService(ACTION_STOP);
+if (torStatus.equals(TorServiceConstants.STATUS_ON))
+{
+if (mBtnVPN.isChecked()) sendIntentToService(ACTION_STOP_VPN);
+sendIntentToService(ACTION_STOP);
+}
+else if (torStatus.equals(STATUS_STARTING)) {
+
+if (!waitingToStop) {
+waitingToStop = true;
+updateStatus("...", STATUS_STOPPING);
+mStatusUpdateHandler.postDelayed(() -> {
+
+if (mBtnVPN.isChecked()) 
sendIntentToService(ACTION_STOP_VPN);
+sendIntentToService(ACTION_STOP);
+waitingToStop = false;
+
+}, 3000);
+}
+}
 
 SnowfallView sv = findViewById(R.id.snowflake_view);
 sv.setVisibility(View.GONE);
@@ -874,26 +913,7 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 
 break;
 
-case TorServiceConstants.STATUS_V3_NAMES_UPDATED:
-if (lastInsertedOnionServiceRowId == -1) break; // another app 
did not request an onion service
-ContentResolver cr = getContentResolver();
-String where = OnionServiceContentProvider.OnionService._ID + 
"=" + lastInsertedOnionServiceRowId;
-Cursor v3Cursor = 
cr.query(OnionServiceContentProvider.CONTENT_URI, 
OnionServiceContentProvider.PROJECTION,
-where, null, null);
-if (v3Cursor == null || v3Cursor.getCount() != 1 || 
!v3Cursor.moveToFirst()) {
-if (v3Cursor != null) v3Cursor.close();
-setResult(RESULT_CANCELED);
-finish();
-return;
-}
-String hostname = 
v3Cursor.getString(v3Cursor.getColumnIndex(OnionServiceContentProvider.OnionService.DOMAIN));
-v3Cursor.close();
-if (TextUtils.isEmpty(hostname)) break;
-Intent response = new Intent();
-response.putExtra(INTENT_EXTRA_REQUESTED_V3_HOSTNAME, 
hostname);
-setResult(RESULT_OK, response);
-finish();
-return;
+
 }
 }
 



___
tor-commits mailing 

[tor-commits] [orbot/master] Small bug with deleting unconfigured v3s

[n8fr8]

commit 06e2b8d4856e5ae1c3ae5abd4906e4c36da54341
Author: b 
Date:   Tue Dec 21 16:43:40 2021 -0500

Small bug with deleting unconfigured v3s
---
 .../android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java
 
b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java
index 1606c2e4..07c5764f 100644
--- 
a/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java
+++ 
b/app/src/main/java/org/torproject/android/ui/v3onionservice/OnionServiceDeleteDialogFragment.java
@@ -34,7 +34,9 @@ public class OnionServiceDeleteDialogFragment extends 
DialogFragment {
 private void doDelete(Bundle arguments, Context context) {
 
context.getContentResolver().delete(OnionServiceContentProvider.CONTENT_URI, 
OnionServiceContentProvider.OnionService._ID + '=' + 
arguments.getInt(OnionServiceActivity.BUNDLE_KEY_ID), null);
 String base = context.getFilesDir().getAbsolutePath() + "/" + 
TorServiceConstants.ONION_SERVICES_DIR;
-DiskUtils.recursivelyDeleteDirectory(new File(base, 
arguments.getString(OnionServiceActivity.BUNDLE_KEY_PATH)));
+String localPath = 
arguments.getString(OnionServiceActivity.BUNDLE_KEY_PATH);
+if (localPath != null)
+DiskUtils.recursivelyDeleteDirectory(new File(base, localPath));
 }
 
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] simplify snowflake strings

[n8fr8]

commit 03470d46b3cde0ef3611cb78b8d16c836b333018
Author: n8fr8 
Date:   Mon Dec 20 22:16:38 2021 -0500

simplify snowflake strings
---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 6130dbd1..1771bd29 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -214,8 +214,8 @@
 Paste Bridges
 Use QR Code
 Snowflake Proxy 
(Experimental)
-Connect through peers via the snowflake 
proxy using domain fronting (Snowflake connections can sometimes take a long 
time to establish)
-Connect through peers via the 
snowflake proxy using AMP cache rendezvous (Snowflake connections can sometimes 
take a long time to establish)
+Connect through other Tor users using 
Snowflake (Method 1 - Fastly)
+Connect through other Tor users using 
Snowflake (Method 2 - AMP)
 Run Snowflake Proxy
 
 Allow other Tor users to connect to Tor 
through your device. (This can\'t be used if you connect alongside 
bridges)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] disable MOAT and Snowflake on SDK < 28 since they don't currently work

[n8fr8]

commit 816c5825098a7a5d98f600feae00e90117a6eca9
Author: n8fr8 
Date:   Mon Dec 20 23:18:43 2021 -0500

disable MOAT and Snowflake on SDK < 28 since they don't currently work
---
 .../android/ui/onboarding/BridgeWizardActivity.java| 14 ++
 app/src/main/res/layout/content_bridge_wizard.xml  |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index 5dc4e770..c28515ed 100644
--- 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -43,10 +43,16 @@ public class BridgeWizardActivity extends AppCompatActivity 
{
 if (actionBar != null) {
 actionBar.setDisplayHomeAsUpEnabled(true);
 }
-
-findViewById(R.id.btnMoat).setOnClickListener(v -> {
-startActivityForResult(new Intent(BridgeWizardActivity.this, 
MoatActivity.class), MOAT_REQUEST_CODE);
-});
+if(android.os.Build.VERSION.SDK_INT < 28){
+findViewById(R.id.btnMoat).setVisibility(View.GONE);
+findViewById(R.id.btnBridgesSnowflake).setVisibility(View.GONE);
+findViewById(R.id.btnSnowflakeAmp).setVisibility(View.GONE);
+}
+else {
+findViewById(R.id.btnMoat).setOnClickListener(v -> {
+startActivityForResult(new Intent(BridgeWizardActivity.this, 
MoatActivity.class), MOAT_REQUEST_CODE);
+});
+}
 
 mBtDirect = findViewById(R.id.btnBridgesDirect);
 mBtDirect.setOnCheckedChangeListener((buttonView, isChecked) -> {
diff --git a/app/src/main/res/layout/content_bridge_wizard.xml 
b/app/src/main/res/layout/content_bridge_wizard.xml
index 65364846..887e5ea4 100644
--- a/app/src/main/res/layout/content_bridge_wizard.xml
+++ b/app/src/main/res/layout/content_bridge_wizard.xml
@@ -30,7 +30,8 @@
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 android:layout_margin="12dp"
-android:text="@string/request_bridges_from_torproject" />
+android:text="@string/request_bridges_from_torproject"
+/>
 
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update to 1652200200

[n8fr8]

commit ec7200b73ad3dd21eaf531d0e00897ac1bd60352
Author: n8fr8 
Date:   Mon Dec 20 23:22:28 2021 -0500

update to 1652200200
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 44d7466e..40dce522 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,7 @@ android {
 minSdkVersion 16
 applicationId 'org.torproject.android'
 targetSdkVersion 29
-versionCode 1652200100
+versionCode 1652200200
 
 versionName getVersionName()
 archivesBaseName = "Orbot-$versionName"



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] conn may be null, but service may be bound, so make sure it is unbound here

[n8fr8]

commit da4162833e049c26ebb54468610d1508b398e529
Author: n8fr8 
Date:   Tue Dec 21 12:46:37 2021 -0500

conn may be null, but service may be bound, so make sure it is unbound here
---
 .../main/java/org/torproject/android/service/OrbotService.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 5fd05409..491fe1fa 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -409,6 +409,11 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
  */
 private void stopTor() throws Exception {
 
+if (shouldUnbindTorService) {
+unbindService(torServiceConnection);
+shouldUnbindTorService = false;
+}
+
 if (conn != null) {
 logNotice("Using control port to shutdown Tor");
 
@@ -420,11 +425,6 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 Log.d(OrbotConstants.TAG, "error shutting down Tor via 
connection", e);
 }
 
-if (shouldUnbindTorService) {
-unbindService(torServiceConnection);
-shouldUnbindTorService = false;
-}
-
 conn = null;
 } else {
 stopSelf();



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] unbinding from tor service will stop tor; don't need to use conn to do it

[n8fr8]

commit f47aff186c391f2f16ec0f2c215e4bdba2c50ca5
Author: n8fr8 
Date:   Tue Dec 21 17:37:15 2021 -0500

unbinding from tor service will stop tor; don't need to use conn to do it
- also removed old commented out code
- also removed making conn and other vars null on service issues, not 
necessary
---
 .../torproject/android/service/OrbotService.java   | 74 ++
 1 file changed, 18 insertions(+), 56 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 491fe1fa..234dcaf1 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -124,7 +124,6 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 private String mCurrentStatus = STATUS_OFF;
 private TorControlConnection conn = null;
 private ServiceConnection torServiceConnection;
-private TorService torService;
 private boolean shouldUnbindTorService;
 private NotificationManager mNotificationManager = null;
 private NotificationCompat.Builder mNotifyBuilder;
@@ -409,26 +408,13 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
  */
 private void stopTor() throws Exception {
 
+   //unbinding from the tor service will stop tor
 if (shouldUnbindTorService) {
 unbindService(torServiceConnection);
 shouldUnbindTorService = false;
 }
 
-if (conn != null) {
-logNotice("Using control port to shutdown Tor");
-
-try {
-logNotice("sending HALT signal to Tor process");
-conn.shutdownTor(TorControlCommands.SIGNAL_SHUTDOWN);
-
-} catch (IOException e) {
-Log.d(OrbotConstants.TAG, "error shutting down Tor via 
connection", e);
-}
-
-conn = null;
-} else {
-stopSelf();
-}
+stopSelf();
 }
 
 private void requestTorRereadConfig() {
@@ -790,16 +776,18 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 torServiceConnection = new ServiceConnection() {
 @Override
 public void onServiceConnected(ComponentName componentName, 
IBinder iBinder) {
-torService = ((TorService.LocalBinder) iBinder).getService();
-
-while ((conn = torService.getTorControlConnection())==null)
-{
-try {
-Thread.sleep(500);
-} catch (InterruptedException e) {
-e.printStackTrace();
-}
+
+//moved torService to a local variable, since we only need it 
once
+TorService torService = ((TorService.LocalBinder) 
iBinder).getService();
+
+while ((conn = torService.getTorControlConnection())==null)
+{
+try {
+Thread.sleep(500);
+} catch (InterruptedException e) {
+e.printStackTrace();
 }
+}
 
 try {
 Thread.sleep(1000);
@@ -807,7 +795,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 e.printStackTrace();
 }
 
-mEventHandler = new TorEventHandler(OrbotService.this);
+mEventHandler = new TorEventHandler(OrbotService.this);
 
 ArrayList events = new ArrayList<>(Arrays.asList(
 TorControlCommands.EVENT_OR_CONN_STATUS,
@@ -841,46 +829,20 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 
 @Override
 public void onServiceDisconnected(ComponentName componentName) {
-conn = null;
-torService = null;
-mEventHandler = null;
+if (Prefs.useDebugLogging())
+Log.d(OrbotConstants.TAG, "TorService: 
onServiceDisconnected");
 }
 
 @Override
 public void onNullBinding(ComponentName componentName) {
-stopTorOnError("Tor was unable to start: " + "onNullBinding");
-conn = null;
-torService = null;
-mEventHandler = null;
+Log.w(OrbotConstants.TAG, "TorService: was unable to bund: 
onNullBinding");
 }
 
 @Override
 public void onBindingDied(ComponentName componentName) {
-stopTorOnError("Tor was unable to start: " + "onBindingDied");
-conn = null;
-torService = null;
-mEventHandler = null;
-   

[tor-commits] [orbot/master] register local v3 name receiver

[n8fr8]

commit 06851dd156abf220979d815766a0b3733314f077
Author: n8fr8 
Date:   Mon Dec 20 22:01:44 2021 -0500

register local v3 name receiver
---
 app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index ba40d5c5..86043921 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -252,6 +252,8 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG));
 lbm.registerReceiver(mLocalBroadcastReceiver,
 new IntentFilter(TorServiceConstants.LOCAL_ACTION_PORTS));
+lbm.registerReceiver(mLocalBroadcastReceiver,
+new 
IntentFilter(TorServiceConstants.LOCAL_ACTION_V3_NAMES_UPDATED));
 
 
 boolean showFirstTime = mPrefs.getBoolean("connect_first_time", true);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge pull request #558 from guardianproject/tor-android-0.4.6.8

[n8fr8]

commit 1ed8efd0f241000fdc6d355e2bef842cc66a5ab2
Merge: dd723e49 06453716
Author: Nathan Freitas 
Date:   Mon Dec 20 15:54:23 2021 -0500

Merge pull request #558 from guardianproject/tor-android-0.4.6.8

tor-android 0.4.6.7 -> 0.4.6.8




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update tor to 0.4.6.8w

[n8fr8]

commit 1d47994f9d8f7dcbc5958b817c6f9c5c472ce16e
Author: n8fr8 
Date:   Mon Dec 20 14:52:01 2021 -0500

update tor to 0.4.6.8w
---
 dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index c9b4f783..4feeb6e5 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -22,7 +22,7 @@ ext {
 guardian_jtorctl : "0.4.5.7",
 ipt_proxy: "1.3.0",
 portmapper   : "2.0.5",
-tor_android  : "0.4.6.7"
+tor_android  : "0.4.6.8"
 ]
 
 libs = [



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] removed new translations for strings that were removed from orbot

[n8fr8]

commit 9770ce87cbbc53808e739530d78eed7e11d1f503
Author: b 
Date:   Sat Dec 18 13:17:16 2021 -0500

removed new translations for strings that were removed from orbot
---
 app/src/main/res/values-fi/strings.xml | 7 ---
 app/src/main/res/values-in/strings.xml | 3 ---
 app/src/main/res/values-it/strings.xml | 1 -
 3 files changed, 11 deletions(-)

diff --git a/app/src/main/res/values-fi/strings.xml 
b/app/src/main/res/values-fi/strings.xml
index ee537c7e..8f800266 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -200,12 +200,6 @@
 Harkitse 
virransäästöasetusten käyttöönottoa
 Harkitse 
virransäästöasetusten poistamista
 Jaa QR-koodina
-Ylläpidetyt palvelut
-Vahvista evästeen poisto
-Poista eväste
-Varmuuskopioi eväste
-Lue QR-koodista
-Tunnistautumisevästettä ei 
määritelty
 Tunnistautumiseväste
 Virhe: Sipulipalvelu käyttää jo 
porttia %s
 Varmuuskopiopalvelu ( Varoitus: Tämä 
voi paljastaa avaimesi toisille sovelluksille )
@@ -217,7 +211,6 @@
 v3 Asiakasohjelman 
todentaminen
 v3 Onion Service asiakasohjelman 
todentaminen
 Ylläpidetty v3 Onion Services
-v2 Onion Services (Vanhentunut)
 Pyydä siltoja 
sähköpostitse
 Salli Wi-Fi 
-vertaisten, yhdistettyjen laitteiden ja kenen tahansa, joka voi yhdistää 
sinun IP-osoitteeseesi, yhdistää Tor-verkkoon.
 Avaa 
välityspalvelin kaikilla rajapinnoilla
diff --git a/app/src/main/res/values-in/strings.xml 
b/app/src/main/res/values-in/strings.xml
index b4242d8e..4489de51 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -121,8 +121,6 @@
 Mode VPN
 MiB
 KiB
-MiB/s
-KiB/s
 Tor HTTP
 Pangkar
 Izinkan
@@ -137,7 +135,6 @@
 Minta Bridges melalui 
Email
 Global (Otomatis)
 Layanan Onion
-Layanan Onion v2 (Usang)
 Layanan Onion v3 Yang Dihosting
 Otorisasi Klien Layanan Onion v3
 Otorisasi Klien v3
diff --git a/app/src/main/res/values-it/strings.xml 
b/app/src/main/res/values-it/strings.xml
index ac957b26..1703e968 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -185,7 +185,6 @@
 Autorizzazione client 
v3
 Autorizzazione client servizio nascosto 
v3
 Servizi nascosti v3 ospitati
-Servizi nascosti v2 (deprecato)
 Richiedi bridge via email
 MiB
 KiB



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] move v3 onion name status to a "local action" instead

[n8fr8]

commit ac3d1bafb69ca87ba0b2d843b21bba7ce8721820
Author: n8fr8 
Date:   Mon Dec 20 14:55:10 2021 -0500

move v3 onion name status to a "local action" instead
---
 .../src/main/java/org/torproject/android/service/OrbotService.java   | 5 -
 .../java/org/torproject/android/service/TorServiceConstants.java | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 49e3240a..5fd05409 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -763,7 +763,10 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 status, perhaps just adding it as an extra to the normal 
Intent callback...
  */
 String oldStatus = mCurrentStatus;
-sendCallbackStatus(STATUS_V3_NAMES_UPDATED);
+Intent intent = new Intent(LOCAL_ACTION_V3_NAMES_UPDATED);
+intent.putExtra(EXTRA_STATUS, mCurrentStatus);
+LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
+
 mCurrentStatus = oldStatus;
 } catch (Exception e) {
 e.printStackTrace();
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
 
b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
index b9b410ad..ea89dbb1 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
@@ -75,14 +75,13 @@ public interface TorServiceConstants {
 String LOCAL_ACTION_BANDWIDTH = "bandwidth";
 String LOCAL_EXTRA_LOG = "log";
 String LOCAL_ACTION_PORTS = "ports";
+String LOCAL_ACTION_V3_NAMES_UPDATED = "V3_NAMES_UPDATED";
 
 /**
  * All tor-related services and daemons are stopped
  */
 String STATUS_OFF = "OFF";
 
-String STATUS_V3_NAMES_UPDATED = "V3_NAMES_UPDATED";
-
 /**
  * All tor-related services and daemons have completed starting
  */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge pull request #542 from weblate/weblate-guardianproject-orbot

[n8fr8]

commit 5615b751e9b581203fb6aaa8d38abc7ff5eae42f
Merge: 65640ebb 172b0234
Author: Nathan Freitas 
Date:   Fri Dec 17 18:19:33 2021 -0500

Merge pull request #542 from weblate/weblate-guardianproject-orbot

Translations update from Hosted Weblate

 app/src/main/res/values-fa/strings.xml | 79 +++---
 app/src/main/res/values-fi/strings.xml |  2 +-
 app/src/main/res/values-in/strings.xml | 10 +++
 app/src/main/res/values-it/strings.xml |  2 +-
 app/src/main/res/values-lt-rLT/strings.xml | 13 ++--
 app/src/main/res/values-pt-rBR/strings.xml | 12 ++--
 app/src/main/res/values-ro-rRO/strings.xml |  2 +-
 app/src/main/res/values-tr/strings.xml | 14 ++--
 app/src/main/res/values-uk/strings.xml | 16 +++--
 app/src/main/res/values-vi/strings.xml | 12 ++--
 app/src/main/res/values-zh-rCN/strings.xml |  4 +-
 app/src/main/res/values/strings.xml| 48 ++---
 .../metadata/android/fa/changelogs/1610.txt|  2 +-
 .../metadata/android/fa/changelogs/1611.txt|  2 +-
 fastlane/metadata/android/fa/full_description.txt  | 21 --
 fastlane/metadata/android/fa/short_description.txt |  2 +-
 16 files changed, 135 insertions(+), 106 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] add comment about how snowlfake bridges may sometimes take a minute

[n8fr8]

commit b2001961e4f73da37f23c1b3c928dbd550ddbe25
Author: b 
Date:   Sat Dec 18 12:04:11 2021 -0500

add comment about how snowlfake bridges may sometimes take a minute
---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 32898103..6130dbd1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -214,8 +214,8 @@
 Paste Bridges
 Use QR Code
 Snowflake Proxy 
(Experimental)
-Connect through peers via the snowflake 
proxy (using domain fronting)
-Connect through peers via the 
snowflake proxy (using AMP cache rendezvous)
+Connect through peers via the snowflake 
proxy using domain fronting (Snowflake connections can sometimes take a long 
time to establish)
+Connect through peers via the 
snowflake proxy using AMP cache rendezvous (Snowflake connections can sometimes 
take a long time to establish)
 Run Snowflake Proxy
 
 Allow other Tor users to connect to Tor 
through your device. (This can\'t be used if you connect alongside 
bridges)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge branch 'ipt_1_3_0'

[n8fr8]

commit 03ef5ef9b8ddd17a72813f1ef79ee70abc7ca165
Merge: 34f4de6d 0c77144e
Author: n8fr8 
Date:   Fri Dec 17 18:01:49 2021 -0500

Merge branch 'ipt_1_3_0'

 app-mini/src/main/res/values-ar/strings.xml|   5 +-
 app-mini/src/main/res/values-ay/strings.xml|   3 -
 app-mini/src/main/res/values-be/strings.xml|   3 -
 app-mini/src/main/res/values-ca/strings.xml|   3 -
 app-mini/src/main/res/values-de/strings.xml|   3 -
 app-mini/src/main/res/values-el/strings.xml|   5 +-
 app-mini/src/main/res/values-es/strings.xml|   5 +-
 app-mini/src/main/res/values-eu/strings.xml|   5 +-
 app-mini/src/main/res/values-fa/strings.xml|   5 +-
 app-mini/src/main/res/values-fr/strings.xml|   5 +-
 app-mini/src/main/res/values-gl/strings.xml|   5 +-
 app-mini/src/main/res/values-hi/strings.xml|   3 -
 app-mini/src/main/res/values-hu/strings.xml|   3 -
 app-mini/src/main/res/values-is/strings.xml|   3 -
 app-mini/src/main/res/values-it/strings.xml|   3 -
 app-mini/src/main/res/values-ja/strings.xml|   3 -
 app-mini/src/main/res/values-mk/strings.xml|   3 -
 app-mini/src/main/res/values-nl/strings.xml|   3 -
 app-mini/src/main/res/values-pt-rBR/strings.xml|   3 -
 app-mini/src/main/res/values-ru/strings.xml|   3 -
 app-mini/src/main/res/values-sv/strings.xml|   5 +-
 app-mini/src/main/res/values-th/strings.xml|   5 +-
 app-mini/src/main/res/values-tr/strings.xml|   5 +-
 app-mini/src/main/res/values-uk/strings.xml|   5 +-
 app-mini/src/main/res/values-zh-rTW/strings.xml|   5 +-
 app-mini/src/main/res/values/strings.xml   |   3 -
 app-tv/src/main/res/values-ar/strings.xml  |   3 -
 app-tv/src/main/res/values-ay/strings.xml  |   3 -
 app-tv/src/main/res/values-be/strings.xml  |   3 -
 app-tv/src/main/res/values-ca/strings.xml  |   3 -
 app-tv/src/main/res/values-de/strings.xml  |   3 -
 app-tv/src/main/res/values-el/strings.xml  |   3 -
 app-tv/src/main/res/values-es/strings.xml  |   3 -
 app-tv/src/main/res/values-eu/strings.xml  |   3 -
 app-tv/src/main/res/values-fa/strings.xml  |   3 -
 app-tv/src/main/res/values-fr/strings.xml  |   3 -
 app-tv/src/main/res/values-gl/strings.xml  |   3 -
 app-tv/src/main/res/values-hi/strings.xml  |   3 -
 app-tv/src/main/res/values-hu/strings.xml  |   3 -
 app-tv/src/main/res/values-is/strings.xml  |   3 -
 app-tv/src/main/res/values-it/strings.xml  |   3 -
 app-tv/src/main/res/values-ja/strings.xml  |   3 -
 app-tv/src/main/res/values-mk/strings.xml  |   3 -
 app-tv/src/main/res/values-nl/strings.xml  |   3 -
 app-tv/src/main/res/values-pt-rBR/strings.xml  |   3 -
 app-tv/src/main/res/values-ru/strings.xml  |   3 -
 app-tv/src/main/res/values-sv/strings.xml  |   3 -
 app-tv/src/main/res/values-th/strings.xml  |   3 -
 app-tv/src/main/res/values-tr/strings.xml  |   3 -
 app-tv/src/main/res/values-uk/strings.xml  |   3 -
 app-tv/src/main/res/values-zh-rTW/strings.xml  |   3 -
 app-tv/src/main/res/values/strings.xml |   3 -
 .../ui/onboarding/BridgeWizardActivity.java| 188 ++---
 .../ui/onboarding/CustomBridgesActivity.java   |   2 +-
 app/src/main/res/layout/content_bridge_wizard.xml  |  18 +-
 app/src/main/res/values-ar/strings.xml |   3 -
 app/src/main/res/values-ay/strings.xml |   3 -
 app/src/main/res/values-be/strings.xml |   3 -
 app/src/main/res/values-ca/strings.xml |   3 -
 app/src/main/res/values-de/strings.xml |   3 -
 app/src/main/res/values-el/strings.xml |   3 -
 app/src/main/res/values-es/strings.xml |   3 -
 app/src/main/res/values-eu/strings.xml |   3 -
 app/src/main/res/values-fa/strings.xml |   3 -
 app/src/main/res/values-fi/strings.xml |   3 -
 app/src/main/res/values-fr-rFR/strings.xml |   3 -
 app/src/main/res/values-fr/strings.xml |   3 -
 app/src/main/res/values-gl/strings.xml |   3 -
 app/src/main/res/values-hi/strings.xml |   3 -
 app/src/main/res/values-hu/strings.xml |   3 -
 app/src/main/res/values-is/strings.xml |   3 -
 app/src/main/res/values-it/strings.xml |   3 -
 app/src/main/res/values-ja/strings.xml |   3 -
 app/src/main/res/values-lt-rLT/strings.xml |   3 -
 app/src/main/res/values-mk/strings.xml |   3 -
 app/src/main/res/values-nb/strings.xml |   3 -
 app/src/main/res/values-nl/strings.xml |   3 -
 app/src/main/res/values-pl/strings.xml |   3 -
 app/src/main/res/values-pt-rBR/strings.xml |   3 -
 app/src/main/res/values-pt-rPT/strings.xml |   3 -
 

[tor-commits] [orbot/master] Merge branch 'master' into external_app_request_v3

[n8fr8]

commit 0e59b55cf045c4b7cf9153e5758033ba6c7afcc2
Merge: d8f6ebb3 03ef5ef9
Author: n8fr8 
Date:   Fri Dec 17 18:10:24 2021 -0500

Merge branch 'master' into external_app_request_v3

 app-mini/src/main/res/values-ar/strings.xml|   5 +-
 app-mini/src/main/res/values-ay/strings.xml|   3 -
 app-mini/src/main/res/values-be/strings.xml|   3 -
 app-mini/src/main/res/values-ca/strings.xml|   3 -
 app-mini/src/main/res/values-de/strings.xml|   3 -
 app-mini/src/main/res/values-el/strings.xml|   5 +-
 app-mini/src/main/res/values-es/strings.xml|   5 +-
 app-mini/src/main/res/values-eu/strings.xml|   5 +-
 app-mini/src/main/res/values-fa/strings.xml|   5 +-
 app-mini/src/main/res/values-fr/strings.xml|   5 +-
 app-mini/src/main/res/values-gl/strings.xml|   5 +-
 app-mini/src/main/res/values-hi/strings.xml|   3 -
 app-mini/src/main/res/values-hu/strings.xml|   3 -
 app-mini/src/main/res/values-is/strings.xml|   3 -
 app-mini/src/main/res/values-it/strings.xml|   3 -
 app-mini/src/main/res/values-ja/strings.xml|   3 -
 app-mini/src/main/res/values-mk/strings.xml|   3 -
 app-mini/src/main/res/values-nl/strings.xml|   3 -
 app-mini/src/main/res/values-pt-rBR/strings.xml|   3 -
 app-mini/src/main/res/values-ru/strings.xml|   3 -
 app-mini/src/main/res/values-sv/strings.xml|   5 +-
 app-mini/src/main/res/values-th/strings.xml|   5 +-
 app-mini/src/main/res/values-tr/strings.xml|   5 +-
 app-mini/src/main/res/values-uk/strings.xml|   5 +-
 app-mini/src/main/res/values-zh-rTW/strings.xml|   5 +-
 app-mini/src/main/res/values/strings.xml   |   3 -
 app-tv/src/main/res/values-ar/strings.xml  |   3 -
 app-tv/src/main/res/values-ay/strings.xml  |   3 -
 app-tv/src/main/res/values-be/strings.xml  |   3 -
 app-tv/src/main/res/values-ca/strings.xml  |   3 -
 app-tv/src/main/res/values-de/strings.xml  |   3 -
 app-tv/src/main/res/values-el/strings.xml  |   3 -
 app-tv/src/main/res/values-es/strings.xml  |   3 -
 app-tv/src/main/res/values-eu/strings.xml  |   3 -
 app-tv/src/main/res/values-fa/strings.xml  |   3 -
 app-tv/src/main/res/values-fr/strings.xml  |   3 -
 app-tv/src/main/res/values-gl/strings.xml  |   3 -
 app-tv/src/main/res/values-hi/strings.xml  |   3 -
 app-tv/src/main/res/values-hu/strings.xml  |   3 -
 app-tv/src/main/res/values-is/strings.xml  |   3 -
 app-tv/src/main/res/values-it/strings.xml  |   3 -
 app-tv/src/main/res/values-ja/strings.xml  |   3 -
 app-tv/src/main/res/values-mk/strings.xml  |   3 -
 app-tv/src/main/res/values-nl/strings.xml  |   3 -
 app-tv/src/main/res/values-pt-rBR/strings.xml  |   3 -
 app-tv/src/main/res/values-ru/strings.xml  |   3 -
 app-tv/src/main/res/values-sv/strings.xml  |   3 -
 app-tv/src/main/res/values-th/strings.xml  |   3 -
 app-tv/src/main/res/values-tr/strings.xml  |   3 -
 app-tv/src/main/res/values-uk/strings.xml  |   3 -
 app-tv/src/main/res/values-zh-rTW/strings.xml  |   3 -
 app-tv/src/main/res/values/strings.xml |   3 -
 .../ui/onboarding/BridgeWizardActivity.java| 188 ++---
 .../ui/onboarding/CustomBridgesActivity.java   |   2 +-
 app/src/main/res/layout/content_bridge_wizard.xml  |  18 +-
 app/src/main/res/values-ar/strings.xml |   3 -
 app/src/main/res/values-ay/strings.xml |   3 -
 app/src/main/res/values-be/strings.xml |   3 -
 app/src/main/res/values-ca/strings.xml |   3 -
 app/src/main/res/values-de/strings.xml |   3 -
 app/src/main/res/values-el/strings.xml |   3 -
 app/src/main/res/values-es/strings.xml |   3 -
 app/src/main/res/values-eu/strings.xml |   3 -
 app/src/main/res/values-fa/strings.xml |   3 -
 app/src/main/res/values-fi/strings.xml |   3 -
 app/src/main/res/values-fr-rFR/strings.xml |   3 -
 app/src/main/res/values-fr/strings.xml |   3 -
 app/src/main/res/values-gl/strings.xml |   3 -
 app/src/main/res/values-hi/strings.xml |   3 -
 app/src/main/res/values-hu/strings.xml |   3 -
 app/src/main/res/values-is/strings.xml |   3 -
 app/src/main/res/values-it/strings.xml |   3 -
 app/src/main/res/values-ja/strings.xml |   3 -
 app/src/main/res/values-lt-rLT/strings.xml |   3 -
 app/src/main/res/values-mk/strings.xml |   3 -
 app/src/main/res/values-nb/strings.xml |   3 -
 app/src/main/res/values-nl/strings.xml |   3 -
 app/src/main/res/values-pl/strings.xml |   3 -
 app/src/main/res/values-pt-rBR/strings.xml |   3 -
 

[tor-commits] [orbot/master] if someone stops during starting, conn could be null

[n8fr8]

commit 1682f7cb89a05e6c4d2e3d197aed55a7745ff717
Author: n8fr8 
Date:   Fri Dec 17 18:14:49 2021 -0500

if someone stops during starting, conn could be null
---
 .../org/torproject/android/service/OrbotService.java  | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 7acc4073..49e3240a 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -819,17 +819,20 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 events.add(TorControlCommands.EVENT_DEBUG_MSG);
 events.add(TorControlCommands.EVENT_INFO_MSG);
 }
-try {
-conn.setEventHandler(mEventHandler);
-conn.setEvents(events);
-logNotice("SUCCESS added control port event handler");
-} catch (IOException e) {
-e.printStackTrace();
-}
+
+if (conn != null) {
+try {
+conn.setEventHandler(mEventHandler);
+conn.setEvents(events);
+logNotice("SUCCESS added control port event handler");
+} catch (IOException e) {
+e.printStackTrace();
+}
 
 
-initControlConnection();
+initControlConnection();
 showConnectedToTorNetworkNotification();
+}
 
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge branch 'external_app_request_v3'

[n8fr8]

commit 65640ebb5765fe38cf5f8d1395d7e77f2ea6cf86
Merge: 03ef5ef9 1682f7cb
Author: n8fr8 
Date:   Fri Dec 17 18:15:47 2021 -0500

Merge branch 'external_app_request_v3'

 .../org/torproject/android/OrbotMainActivity.java  | 40 --
 .../torproject/android/service/OrbotService.java   | 37 +---
 .../android/service/TorServiceConstants.java   |  5 +++
 3 files changed, 67 insertions(+), 15 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] removed faulty bridge wizard from bridges page...paving the way to add a new bridge here...

[n8fr8]

commit bdee3957bf052ad37799f3c40c86dab654e9c462
Author: b 
Date:   Wed Dec 15 17:29:23 2021 -0500

removed faulty bridge wizard from bridges page...paving the way to add a 
new bridge here...
---
 app-mini/src/main/res/values-ar/strings.xml|   5 +-
 app-mini/src/main/res/values-ay/strings.xml|   3 -
 app-mini/src/main/res/values-be/strings.xml|   3 -
 app-mini/src/main/res/values-ca/strings.xml|   3 -
 app-mini/src/main/res/values-de/strings.xml|   3 -
 app-mini/src/main/res/values-el/strings.xml|   5 +-
 app-mini/src/main/res/values-es/strings.xml|   5 +-
 app-mini/src/main/res/values-eu/strings.xml|   5 +-
 app-mini/src/main/res/values-fa/strings.xml|   5 +-
 app-mini/src/main/res/values-fr/strings.xml|   5 +-
 app-mini/src/main/res/values-gl/strings.xml|   5 +-
 app-mini/src/main/res/values-hi/strings.xml|   3 -
 app-mini/src/main/res/values-hu/strings.xml|   3 -
 app-mini/src/main/res/values-is/strings.xml|   3 -
 app-mini/src/main/res/values-it/strings.xml|   3 -
 app-mini/src/main/res/values-ja/strings.xml|   3 -
 app-mini/src/main/res/values-mk/strings.xml|   3 -
 app-mini/src/main/res/values-nl/strings.xml|   3 -
 app-mini/src/main/res/values-pt-rBR/strings.xml|   3 -
 app-mini/src/main/res/values-ru/strings.xml|   3 -
 app-mini/src/main/res/values-sv/strings.xml|   5 +-
 app-mini/src/main/res/values-th/strings.xml|   5 +-
 app-mini/src/main/res/values-tr/strings.xml|   5 +-
 app-mini/src/main/res/values-uk/strings.xml|   5 +-
 app-mini/src/main/res/values-zh-rTW/strings.xml|   5 +-
 app-mini/src/main/res/values/strings.xml   |   3 -
 app-tv/src/main/res/values-ar/strings.xml  |   3 -
 app-tv/src/main/res/values-ay/strings.xml  |   3 -
 app-tv/src/main/res/values-be/strings.xml  |   3 -
 app-tv/src/main/res/values-ca/strings.xml  |   3 -
 app-tv/src/main/res/values-de/strings.xml  |   3 -
 app-tv/src/main/res/values-el/strings.xml  |   3 -
 app-tv/src/main/res/values-es/strings.xml  |   3 -
 app-tv/src/main/res/values-eu/strings.xml  |   3 -
 app-tv/src/main/res/values-fa/strings.xml  |   3 -
 app-tv/src/main/res/values-fr/strings.xml  |   3 -
 app-tv/src/main/res/values-gl/strings.xml  |   3 -
 app-tv/src/main/res/values-hi/strings.xml  |   3 -
 app-tv/src/main/res/values-hu/strings.xml  |   3 -
 app-tv/src/main/res/values-is/strings.xml  |   3 -
 app-tv/src/main/res/values-it/strings.xml  |   3 -
 app-tv/src/main/res/values-ja/strings.xml  |   3 -
 app-tv/src/main/res/values-mk/strings.xml  |   3 -
 app-tv/src/main/res/values-nl/strings.xml  |   3 -
 app-tv/src/main/res/values-pt-rBR/strings.xml  |   3 -
 app-tv/src/main/res/values-ru/strings.xml  |   3 -
 app-tv/src/main/res/values-sv/strings.xml  |   3 -
 app-tv/src/main/res/values-th/strings.xml  |   3 -
 app-tv/src/main/res/values-tr/strings.xml  |   3 -
 app-tv/src/main/res/values-uk/strings.xml  |   3 -
 app-tv/src/main/res/values-zh-rTW/strings.xml  |   3 -
 app-tv/src/main/res/values/strings.xml |   3 -
 .../ui/onboarding/BridgeWizardActivity.java| 178 +
 app/src/main/res/values-ar/strings.xml |   3 -
 app/src/main/res/values-ay/strings.xml |   3 -
 app/src/main/res/values-be/strings.xml |   3 -
 app/src/main/res/values-ca/strings.xml |   3 -
 app/src/main/res/values-de/strings.xml |   3 -
 app/src/main/res/values-el/strings.xml |   3 -
 app/src/main/res/values-es/strings.xml |   3 -
 app/src/main/res/values-eu/strings.xml |   3 -
 app/src/main/res/values-fa/strings.xml |   3 -
 app/src/main/res/values-fi/strings.xml |   3 -
 app/src/main/res/values-fr-rFR/strings.xml |   3 -
 app/src/main/res/values-fr/strings.xml |   3 -
 app/src/main/res/values-gl/strings.xml |   3 -
 app/src/main/res/values-hi/strings.xml |   3 -
 app/src/main/res/values-hu/strings.xml |   3 -
 app/src/main/res/values-is/strings.xml |   3 -
 app/src/main/res/values-it/strings.xml |   3 -
 app/src/main/res/values-ja/strings.xml |   3 -
 app/src/main/res/values-lt-rLT/strings.xml |   3 -
 app/src/main/res/values-mk/strings.xml |   3 -
 app/src/main/res/values-nb/strings.xml |   3 -
 app/src/main/res/values-nl/strings.xml |   3 -
 app/src/main/res/values-pl/strings.xml |   3 -
 app/src/main/res/values-pt-rBR/strings.xml |   3 -
 app/src/main/res/values-pt-rPT/strings.xml |   3 -
 app/src/main/res/values-pt/strings.xml |   3 -
 

[tor-commits] [orbot/master] fixed status bug reported in #556

[n8fr8]

commit d8f6ebb333a3d2b1886949c7dc44a9870264029d
Author: b 
Date:   Fri Dec 17 14:59:10 2021 -0500

fixed status bug reported in #556
---
 .../main/java/org/torproject/android/service/OrbotService.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 3cc7ab40..190ecc4e 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -734,7 +734,15 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 }
 }
 }
+/*
+This old status hack is temporary and fixes the issue reported 
by syphyr at
+https://github.com/guardianproject/orbot/pull/556
+Down the line a better approach needs to happen for sending 
back the onion names updated
+status, perhaps just adding it as an extra to the normal 
Intent callback...
+ */
+String oldStatus = mCurrentStatus;
 sendCallbackStatus(STATUS_V3_NAMES_UPDATED);
+mCurrentStatus = oldStatus;
 } catch (Exception e) {
 e.printStackTrace();
 }
@@ -1400,7 +1408,6 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 
 public void run() {
 String action = mIntent.getAction();
-
 if (!TextUtils.isEmpty(action)) {
 if (action.equals(ACTION_START) || 
action.equals(ACTION_START_ON_BOOT)) {
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Snowflake animations had a bug; they'd appear if tor connects and the pref is set to true even if proxy wasn't enabled (because bridges were...)

[n8fr8]

commit 843effd93e5f513bc83ef8a1baf9b7e7be5e4a8c
Author: b 
Date:   Wed Dec 15 16:50:35 2021 -0500

Snowflake animations had a bug; they'd appear if tor connects and the pref 
is set to true even if proxy wasn't enabled (because bridges were...)
---
 orbotservice/src/main/assets/fronts  | 1 +
 .../src/main/java/org/torproject/android/service/util/Prefs.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/orbotservice/src/main/assets/fronts 
b/orbotservice/src/main/assets/fronts
index 6cafa57b..3900c33a 100644
--- a/orbotservice/src/main/assets/fronts
+++ b/orbotservice/src/main/assets/fronts
@@ -1,6 +1,7 @@
 snowflake-target 
https://snowflake-broker.torproject.net.global.prod.fastly.net/
 snowflake-front cdn.sstatic.net
 snowflake-stun stun:stun.stunprotocol.org:3478
+snowflake-ampcache https://cdn.ampproject.org/
 moat-cdn https://d50gd378qj74g.cloudfront.net/
 moat-url https://moat.torproject.org.global.prod.fastly.net/
 moat-front cdn.sstatic.net
\ No newline at end of file
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java 
b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
index d12cc6a6..78ef2d81 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
@@ -76,6 +76,7 @@ public class Prefs {
 }
 
 public static boolean beSnowflakeProxy () {
+if (Prefs.bridgesEnabled()) return false;
 return prefs.getBoolean(PREF_BE_A_SNOWFLAKE,false);
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] tor-android 0.4.6.7 -> 0.4.6.8

[n8fr8]

commit 06453716a47de6342aa43cfc07ba9d76066b22cd
Author: b 
Date:   Fri Dec 17 15:44:12 2021 -0500

tor-android 0.4.6.7 -> 0.4.6.8
---
 dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 555c4977..0d4a9da7 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -22,7 +22,7 @@ ext {
 guardian_jtorctl : "0.4.5.7",
 ipt_proxy: "1.2.0",
 portmapper   : "2.0.5",
-tor_android  : "0.4.6.7"
+tor_android  : "0.4.6.8"
 ]
 
 libs = [



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] add support for snowflake with amp rendezvous

[n8fr8]

commit 0c77144ee3fd423e043b732499766ab37c6e1309
Author: b 
Date:   Wed Dec 15 18:09:58 2021 -0500

add support for snowflake with amp rendezvous
---
 .../ui/onboarding/BridgeWizardActivity.java| 10 +++
 .../ui/onboarding/CustomBridgesActivity.java   |  2 +-
 app/src/main/res/layout/content_bridge_wizard.xml  | 18 ++--
 app/src/main/res/values/strings.xml|  3 +-
 orbotservice/src/main/assets/fronts|  1 -
 .../torproject/android/service/OrbotService.java   | 32 --
 6 files changed, 46 insertions(+), 20 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
index 19e998d0..5dc4e770 100644
--- 
a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
@@ -25,6 +25,7 @@ public class BridgeWizardActivity extends AppCompatActivity {
 private RadioButton mBtObfs4;
 private RadioButton mBtCustom;
 private RadioButton mBtSnowflake;
+private RadioButton mBtnSnowflakeAmp;
 private View mBtnConfgiureCustomBridges;
 
 private static boolean noBridgesSet() {
@@ -68,6 +69,13 @@ public class BridgeWizardActivity extends AppCompatActivity {
 Prefs.putBridgesEnabled(true);
 });
 
+mBtnSnowflakeAmp = findViewById(R.id.btnSnowflakeAmp);
+mBtnSnowflakeAmp.setOnCheckedChangeListener((buttonView, isChecked) -> 
{
+if (!isChecked) return;
+Prefs.setBridgesList("snowflake-amp");
+Prefs.putBridgesEnabled(true);
+});
+
 mBtCustom = findViewById(R.id.btnCustomBridges);
 mBtCustom.setOnCheckedChangeListener((buttonView, isChecked) ->
 mBtnConfgiureCustomBridges.setVisibility(isChecked ? 
View.VISIBLE : View.GONE));
@@ -125,6 +133,8 @@ public class BridgeWizardActivity extends AppCompatActivity 
{
 mBtObfs4.setChecked(true);
 } else if (Prefs.getBridgesList().equals("snowflake")) {
 mBtSnowflake.setChecked(true);
+} else if (Prefs.getBridgesList().equals("snowflake-amp")) {
+mBtnSnowflakeAmp.setChecked(true);
 } else {
 mBtCustom.setChecked(true);
 }
diff --git 
a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
 
b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
index 91f50235..3a0babb8 100644
--- 
a/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/onboarding/CustomBridgesActivity.java
@@ -204,6 +204,6 @@ public class CustomBridgesActivity extends 
AppCompatActivity implements TextWatc
 
 private static boolean userHasSetPreconfiguredBridge(String bridges) {
 if (bridges == null) return false;
-return bridges.equals("obfs4") || bridges.equals("meek") || 
bridges.equals("snowflake");
+return bridges.equals("obfs4") || bridges.equals("meek") || 
bridges.equals("snowflake") || bridges.equals("snowflake-amp");
 }
 }
diff --git a/app/src/main/res/layout/content_bridge_wizard.xml 
b/app/src/main/res/layout/content_bridge_wizard.xml
index 6dbca868..65364846 100644
--- a/app/src/main/res/layout/content_bridge_wizard.xml
+++ b/app/src/main/res/layout/content_bridge_wizard.xml
@@ -67,6 +67,14 @@
 android:layout_margin="12dp"
 android:text="@string/bridge_snowflake" />
 
+
+
+
 
 
+
 
 
 
 
-
 
 
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 3b54a1d7..3a4987d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -249,7 +249,8 @@
 Paste Bridges
 Use QR Code
 Snowflake Proxy 
(Experimental)
-Connect through other Tor peers 
(experimental)
+Connect through peers via the snowflake 
proxy (using domain fronting)
+Connect through peers via the 
snowflake proxy (using AMP cache rendezvous)
 Run Snowflake Proxy
 Allow other Tor users to connect to Tor 
through your device. (This can\'t be used if you connect alongside 
bridges)
 
diff --git a/orbotservice/src/main/assets/fronts 
b/orbotservice/src/main/assets/fronts
index 3900c33a..6cafa57b 100644
--- a/orbotservice/src/main/assets/fronts
+++ b/orbotservice/src/main/assets/fronts
@@ -1,7 +1,6 @@
 snowflake-target 
https://snowflake-broker.torproject.net.global.prod.fastly.net/
 snowflake-front cdn.sstatic.net
 snowflake-stun stun:stun.stunprotocol.org:3478
-snowflake-ampcache https://cdn.ampproject.org/
 moat-cdn https://d50gd378qj74g.cloudfront.net/
 moat-url https://moat.torproject.org.global.prod.fastly.net/
 moat-front cdn.sstatic.net
\ No newline at end of file
diff --git 

[tor-commits] [orbot/master] Interface for #540

[n8fr8]

commit 0123927ab563af9afd13924dd3f8a7eb8777ba36
Author: b 
Date:   Thu Dec 9 18:42:42 2021 -0500

Interface for #540

- External apps can request orbot to spin up a v3 service
- When cancelled, apps are informed
- When service is created, apps get the .onion url

Also introdued a change where onion service domains are updated when a
fresh connection tor tor is achieved, so users don't have to restart app
---
 .../org/torproject/android/OrbotMainActivity.java  | 40 --
 .../torproject/android/service/OrbotService.java   |  9 ++---
 .../android/service/TorServiceConstants.java   |  5 +++
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 3853f957..2310b3b8 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -8,6 +8,7 @@ import android.app.AlertDialog;
 import android.app.Application;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -16,6 +17,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.database.Cursor;
 import android.net.Uri;
 import android.net.VpnService;
 import android.os.Build;
@@ -98,6 +100,7 @@ import static 
org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
 public class OrbotMainActivity extends AppCompatActivity implements 
OrbotConstants {
 
 private static final String INTENT_ACTION_REQUEST_V3_ONION_SERVICE = 
"org.torproject.android.REQUEST_V3_ONION_SERVICE";
+private static final String INTENT_EXTRA_REQUESTED_V3_HOSTNAME = 
"org.torproject.android.REQUESTED_V3_HOSTNAME";
 private static final String INTENT_ACTION_REQUEST_START_TOR = 
"org.torproject.android.START_TOR";
 private static final int REQUEST_VPN = ;
 private static final int REQUEST_SETTINGS = 0x9874;
@@ -133,6 +136,9 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 private String torStatus = null; //latest status reported from the tor 
service
 private Intent lastStatusIntent;  // the last ACTION_STATUS Intent received
 
+// used when apps request a new v3 service
+private long lastInsertedOnionServiceRowId = -1;
+
 /**
  * The state and log info from {@link OrbotService} are sent to the UI 
here in
  * the form of a local broadcast. Regular broadcasts can be sent by any 
app,
@@ -507,7 +513,8 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 fields.put(OnionServiceContentProvider.OnionService.CREATED_BY_USER, 
0);
 
 ContentResolver contentResolver = getContentResolver();
-contentResolver.insert(OnionServiceContentProvider.CONTENT_URI, 
fields);
+lastInsertedOnionServiceRowId = 
ContentUris.parseId(contentResolver.insert(OnionServiceContentProvider.CONTENT_URI,
 fields));
+
 
 if (torStatus.equals(TorServiceConstants.STATUS_OFF)) {
 startTor();
@@ -538,7 +545,11 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 new AlertDialog.Builder(this)
 .setMessage(getString(R.string.hidden_service_request, 
v3LocalPort))
 .setPositiveButton(R.string.allow, (d, w) -> 
enableV3OnionService(v3LocalPort, v3onionPort, finalName))
-.setNegativeButton(R.string.deny, (d, w) -> 
d.dismiss())
+.setNegativeButton(R.string.deny, (d, w) -> {
+setResult(RESULT_CANCELED);
+d.dismiss();
+finish();
+})
 .show();
 return;
 
@@ -804,6 +815,10 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 
 }
 
+// if new onion hostnames are generated, update local DB
+
sendIntentToService(TorServiceConstants.ACTION_UPDATE_ONION_NAMES);
+
+
 
 if (autoStartFromIntent) {
 autoStartFromIntent = false;
@@ -858,6 +873,27 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 resetBandwidthStatTextviews();
 
 break;
+
+case TorServiceConstants.STATUS_V3_NAMES_UPDATED:
+if (lastInsertedOnionServiceRowId == -1) break; // another app 
did not request an onion service
+ContentResolver cr = getContentResolver();
+String where = 

[tor-commits] [orbot/master] Snowflake proxy uses defaults in IPtProxy, displays cute toast when user connects. activity text for snowflake proxy isn't in ALL CAPS anymore

[n8fr8]

commit 50ef12d356d0a0548f12edc0c028da2dfc6820c5
Author: b 
Date:   Wed Dec 15 17:14:22 2021 -0500

Snowflake proxy uses defaults in IPtProxy, displays cute toast when user 
connects. activity text for snowflake proxy isn't in ALL CAPS anymore
---
 app/src/main/res/values/strings.xml  |  2 +-
 .../java/org/torproject/android/service/OrbotService.java| 12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 9ba83a26..dfdb38ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -258,7 +258,7 @@
 
 Snowflake Proxy Limits
 Only when device is plugged in 
and on wifi
-SNOWFLAKE PROXY MODE 
ENABLED
+Snowflake proxy 
mode enabled
 Show Connection 
Notification
 Show a message when your 
snowflake helps someone circumvent censorship
 
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 8520a815..8fef4543 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -355,10 +355,10 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 String target = getCdnFront("snowflake-target");
 String front = getCdnFront("snowflake-front");
 String stunServer = getCdnFront("snowflake-stun");
-String ampCache = "https://cdn.ampproject.org/;;
+String ampCache = null; //  getCdnFront("snowflake-ampcache");
 
 IPtProxy.startSnowflake(stunServer, target, front, ampCache,
- null, true, false, true, 1);
+ null, true, false, false, 1);
 }
 
 /*
@@ -366,9 +366,9 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
  */
 private void enableSnowflakeProxy () {
 int capacity = 1;
-String broker = "https://snowflake-broker.bamsoftware.com/;;
-String relay = "wss://snowflake.bamsoftware.com/";
-String stun = "stun:stun.stunprotocol.org:3478";
+String broker = null; // "https://snowflake-broker.bamsoftware.com/;;
+String relay =  null; // "wss://snowflake.bamsoftware.com/";
+String stun = null; // "stun:stun.stunprotocol.org:3478";
 String natProbe = null;
 String logFile = null;
 boolean keepLocalAddresses = true;
@@ -377,7 +377,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 if (Prefs.showSnowflakeProxyMessage()) {
 callback = (SnowflakeClientConnected) () -> {
 String message = 
String.format(getString(R.string.snowflake_proxy_client_connected_msg), 
"❄️", "❄️");
-Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+new Handler(getMainLooper()).post(() -> 
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG).show());
 };
 }
 IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, 
logFile, keepLocalAddresses, unsafeLogging, callback);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Experimental show snowflake toast when client connects to proxy...

[n8fr8]

commit 798ef6eb5d7f8d0b7b147841061821d8a091
Author: b 
Date:   Tue Dec 14 18:39:18 2021 -0500

Experimental show snowflake toast when client connects to proxy...
---
 app/src/main/res/values/strings.xml |  3 +++
 app/src/main/res/xml/preferences.xml|  7 +++
 .../android/core/ui/SettingsPreferencesActivity.kt  |  1 +
 .../java/org/torproject/android/service/OrbotService.java   | 13 ++---
 .../java/org/torproject/android/service/util/Prefs.java |  5 +
 orbotservice/src/main/res/values/strings.xml|  3 +++
 6 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index c3a43f01..9ba83a26 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -259,6 +259,9 @@
 Snowflake Proxy Limits
 Only when device is plugged in 
and on wifi
 SNOWFLAKE PROXY MODE 
ENABLED
+Show Connection 
Notification
+Show a message when your 
snowflake helps someone circumvent censorship
+
 
 
 
diff --git a/app/src/main/res/xml/preferences.xml 
b/app/src/main/res/xml/preferences.xml
index a05bce87..60619894 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -297,6 +297,13 @@
 android:key="pref_be_a_snowflake"
 android:title="@string/be_a_snowflake_title"
 android:summary="@string/be_a_snowflake_desc" />
+
+
+
 
 
 
diff --git 
a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt
 
b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt
index 79f00544..5fe575ad 100644
--- 
a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt
+++ 
b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt
@@ -35,6 +35,7 @@ class SettingsPreferencesActivity : PreferenceActivity() {
 val bridgesEnabled = 
getSharedPreferences("org.torproject.android_preferences", 
MODE_MULTI_PROCESS).getBoolean("pref_bridges_enabled", false)
 findPreference("pref_be_a_snowflake")?.isEnabled = !bridgesEnabled
 findPreference("pref_be_a_snowflake_limit")?.isEnabled = 
!bridgesEnabled
+findPreference("pref_show_snowflake_proxy_msg")?.isEnabled = 
!bridgesEnabled
 }
 
 override fun attachBaseContext(newBase: Context) = 
super.attachBaseContext(LocaleHelper.onAttach(newBase))
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 495e2739..8520a815 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -36,6 +36,7 @@ import android.os.IBinder;
 import android.provider.BaseColumns;
 import android.text.TextUtils;
 import android.util.Log;
+import android.widget.Toast;
 
 import net.freehaven.tor.control.TorControlCommands;
 import net.freehaven.tor.control.TorControlConnection;
@@ -74,7 +75,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeoutException;
 
 import IPtProxy.IPtProxy;
-
+import IPtProxy.SnowflakeClientConnected;
 import androidx.annotation.ChecksSdkIntAtLeast;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
@@ -372,8 +373,14 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 String logFile = null;
 boolean keepLocalAddresses = true;
 boolean unsafeLogging = false;
-IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, 
logFile, keepLocalAddresses, unsafeLogging, null);
-
+SnowflakeClientConnected callback = null;
+if (Prefs.showSnowflakeProxyMessage()) {
+callback = (SnowflakeClientConnected) () -> {
+String message = 
String.format(getString(R.string.snowflake_proxy_client_connected_msg), 
"❄️", "❄️");
+Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+};
+}
+IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, 
logFile, keepLocalAddresses, unsafeLogging, callback);
 logNotice("Snowflake Proxy mode ENABLED");
 }
 
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java 
b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
index eaec24e5..d12cc6a6 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java
@@ -21,6 +21,7 @@ public class Prefs {
 private final static String PREF_USE_VPN = "pref_vpn";
 private final static String PREF_EXIT_NODES = "pref_exit_nodes";
 private final static String 

[tor-commits] [orbot/master] for now, disable snowflake proxy limiting

[n8fr8]

commit 9cf66800aa9b6378460499e66fac27773ad46058
Author: b 
Date:   Tue Dec 14 18:06:38 2021 -0500

for now, disable snowflake proxy limiting
---
 app/src/main/res/xml/preferences.xml  | 10 +-
 .../java/org/torproject/android/service/OrbotService.java | 11 +--
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/xml/preferences.xml 
b/app/src/main/res/xml/preferences.xml
index 28e06052..c1fb75ae 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -297,11 +297,11 @@
 android:key="pref_be_a_snowflake"
 android:title="@string/be_a_snowflake_title"
 android:summary="@string/be_a_snowflake_desc" />
-
+
+
+
+
+
 
 
 
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 4b9a12e6..1b15e0da 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -1412,16 +1412,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 else if (useIPtSnowflakeProxy())
 startSnowflakeClient();
 } else if (Prefs.beSnowflakeProxy()) {
-
-if (Prefs.limitSnowflakeProxying())
-{
-if (isChargingAndWifi(OrbotService.this))
-{
-enableSnowflakeProxy();
-}
-
-}
-else
+//if (Prefs.limitSnowflakeProxying()) {
 enableSnowflakeProxy();
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Closes #554, IPtProxy 1.3.0 added

[n8fr8]

commit c984dcc5254eda6a55e91a6d5bfe74023fb60978
Author: b 
Date:   Tue Dec 14 18:29:43 2021 -0500

Closes #554, IPtProxy 1.3.0 added
---
 dependencies.gradle| 2 +-
 .../src/main/java/org/torproject/android/service/OrbotService.java | 7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 555c4977..c9b4f783 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -20,7 +20,7 @@ ext {
 guardian_geoip   : "20191217",
 guardian_jsocks  : "1.0.4",
 guardian_jtorctl : "0.4.5.7",
-ipt_proxy: "1.2.0",
+ipt_proxy: "1.3.0",
 portmapper   : "2.0.5",
 tor_android  : "0.4.6.7"
 ]
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 1b15e0da..495e2739 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -354,10 +354,10 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 String target = getCdnFront("snowflake-target");
 String front = getCdnFront("snowflake-front");
 String stunServer = getCdnFront("snowflake-stun");
+String ampCache = "https://cdn.ampproject.org/;;
 
-IPtProxy.startSnowflake(stunServer, target, front,
+IPtProxy.startSnowflake(stunServer, target, front, ampCache,
  null, true, false, true, 1);
-
 }
 
 /*
@@ -368,10 +368,11 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 String broker = "https://snowflake-broker.bamsoftware.com/;;
 String relay = "wss://snowflake.bamsoftware.com/";
 String stun = "stun:stun.stunprotocol.org:3478";
+String natProbe = null;
 String logFile = null;
 boolean keepLocalAddresses = true;
 boolean unsafeLogging = false;
-IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, logFile, 
keepLocalAddresses, unsafeLogging);
+IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, natProbe, 
logFile, keepLocalAddresses, unsafeLogging, null);
 
 logNotice("Snowflake Proxy mode ENABLED");
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Turkish)

[n8fr8]

commit 2f23db8563d2880398a17e257c5a1dff1ea0051f
Author: Oğuz Ersen 
Date:   Fri Dec 3 08:50:52 2021 +0100

Translated using Weblate (Turkish)

Currently translated at 100.0% (211 of 211 strings)

Co-authored-by: Oğuz Ersen 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/tr/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-tr/strings.xml | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-tr/strings.xml 
b/app/src/main/res/values-tr/strings.xml
index c55bee2c..eeeb4915 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -18,7 +18,7 @@
 QR kodu tara
 QR kodu paylaş
 
-Orbot; Tor, Obfs4Proxy, BadVPN, 
Tun2Socks, LibEvent yapılarını kapsayan açık kaynaklı bir uygulamadır. 
Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS 
vekil sunucu (9050) sağlar. Orbot ayrıca, rootlanmış aygıtlarda tüm 
internet trafiğini Tor üzerinden gönderebilir.
+Orbot; Tor, Obfs4Proxy, BadVPN, 
Tun2Socks, LibEvent yapılarını kapsayan açık kaynaklı bir uygulamadır. 
Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS 
vekil sunucu (9050) sağlar.
 
 Genel
 Orbot Açılışta 
Başlatılsın
@@ -81,8 +81,8 @@
 Kısıtlanmış bir 
güvenlik duvarından erişilebilir bağlantı noktaları
 Bağlantı noktalarını girin
 hata 
ayıklama günlüğü etkinleştirilsin (görüntülemek için adb ya da 
aLogCat gerekir)
-Proje Adres(ler)i:
-https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
+Proje Ana Sayfası:
+https://orbot.app/
 Üçüncü Taraf Yazılım:
 Tor: https://www.torproject.org
 LibEvent v2.0.21: 
http://www.monkey.org/~provos/libevent/
@@ -204,7 +204,7 @@
 Yedekleme dosyası adı…
 Ä°stemci 
Yetkilendirmesini Sil
 Ä°stemci Yetkilendirme 
Anahtarını Sil
-Uyarı: Bu, Diğer Uygulamaların 
Anahtarınıza Erişebilmesine Neden Olabilir
+Uyarı: Bu, diğer uygulamaların 
anahtarınıza erişebilmesine neden olabilir
 İstemci Yetkilendirme Anahtarını 
Yedekle
 v3 .onion Etki Alanı
 Base 32 olarak x25519 Özel Anahtarı
@@ -213,8 +213,10 @@
 Barındırılan v3 Onion 
Hizmetleri
 Reddet
 Ä°zin ver
-Hata: Bir Onion Hizmeti Zaten %s 
Bağlantı Noktasını Kullanıyor
+Hata: Bir Onion hizmeti zaten %s 
bağlantı noktasını kullanıyor
 Snowflake Vekil 
Sınırları
 Yalnızca aygıt prize takılı 
ve kablosuz ağa bağlıysa
-SNOWFLAKE VEKÄ°L MODU ETKIN
+Snowflake vekil modu etkin
+Sürüm:
+Lisans:
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Chinese (Simplified))

[n8fr8]

commit 3d8182ecda4bee0c308ff76a5432acfb97236a92
Author: Eric 
Date:   Fri Dec 3 08:50:53 2021 +0100

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (211 of 211 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 99.0% (209 of 211 strings)

Co-authored-by: Eric 
Translate-URL: 
https://hosted.weblate.org/projects/guardianproject/orbot/zh_Hans/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-zh-rCN/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml 
b/app/src/main/res/values-zh-rCN/strings.xml
index a6979c54..6c863a8d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -214,7 +214,9 @@
 拒绝
 允许
 错误：一个 Onion 
服务已经在使用端口 %s
-仅
当设备接通电源并连接到 wifi 时
+仅
当设备接通电源并连接到 Wi-Fi 时
 Snowflake 代理限制
 SNOWFLAKE 
代理模式已启用
+许可证：
+版本：
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge pull request #551 from guardianproject/fix_549_no_snowflake_and_bridge_ui

[n8fr8]

commit 34f4de6d98eaf7ec19dd30d5ca0187a52e5ac5c5
Merge: 9cf66800 a1d04487
Author: bitmold 
Date:   Tue Dec 14 18:38:34 2021 -0500

Merge pull request #551 from 
guardianproject/fix_549_no_snowflake_and_bridge_ui

Fixes #549 snowflake preferences are greyed out when bridges are in use

 app/src/main/res/values/strings.xml| 3 ++-
 app/src/main/res/xml/preferences.xml   | 2 +-
 .../org/torproject/android/core/ui/SettingsPreferencesActivity.kt  | 7 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Ukrainian)

[n8fr8]

commit 32753b41bda15ac705311d4baf2c1aeffc16d358
Author: Ihor Hordiichuk 
Date:   Fri Dec 3 08:50:52 2021 +0100

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (211 of 211 strings)

Co-authored-by: Ihor Hordiichuk 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/uk/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-uk/strings.xml | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-uk/strings.xml 
b/app/src/main/res/values-uk/strings.xml
index 7bae74ea..ef4c8e4c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -18,7 +18,7 @@
 Сканувати BridgeQR
 Поділитися BridgeQR
 
-Orbot — це програма з 
відкритим кодом, яка містить Tor, Obfs4Proxy, BadVPN, 
Tun2Socks, LibEvent. Він забезпечує локальний 
HTTP-проксі (8118) та проксі SOCKS (9050) у мережу Tor. 
Orbot також має здатність, на кореневому 
пристрої, відправляти весь інтернет-трафік 
через Tor.
+Orbot — це застосунок з 
відкритим кодом, що містить Tor, Obfs4Proxy, BadVPN, 
Tun2Socks, LibEvent. Він забезпечує локальний 
HTTP-проксі (8118) та проксі SOCKS (9050) у мережу 
Tor.
 
 Основні
 Запуск Orbot при 
ввімкненні
@@ -81,8 +81,8 @@
 Порти 
доступні із обмежуваного брандмауера
 Введіть порти
 Увімкнути
 вивід журналу зневадження (потрібно 
використовувати adb або aLogCat для 
перегляду)
-Домашня сторінка(и) 
проєкту:
-https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
+Домівка проєкту:
+https://orbot.app/
 Програми сторонніх 
розробників: 
 Tor: https://www.torproject.org
 LibEvent v2.0.21: 
http://www.monkey.org/~provos/libevent/
@@ -204,17 +204,19 @@
 Назва файлу 
резервної копії…
 Видалити 
авторизацію клієнта
 Видалити ключ 
авторизації клієнта
-Попередження. Це 
може відкрити ваш ключ для інших 
програм
+Попередження: Це 
може відкрити ваш ключ для інших 
застосунків
 Резервне копіювання 
ключа авторизації клієнта
 Домен .onion v3
-x25519 Закритий ключ у базі 
32
+x25519 Закритий ключ у 
Base32
 Авторизація 
клієнта v3
 Авторизація клієнта 
служби Onion v3
 Хостинг служб Onion 
v3
 Заборонити
 Длзволити
 Помилка: служба Onion вже 
використовує порт %s
-Тільки коли 
пристрій під\'єднано до мережі Wi-Fi
+Тільки коли 
пристрій заряджається і під\'єднаний до 
мережі Wi-Fi
 Обмеження проксі 
Snowflake
-РЕЖИМ SNOWFLAKE-ПРОКСІ 
УВІМКНЕНО
+Режим Snowflake-проксі 
увімкнено
+Версія:
+Ліцензія:
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Vietnamese)

[n8fr8]

commit 1abfd73f1ed394a00b57ac726ee69be5a620c281
Author: bruh 
Date:   Fri Dec 3 08:50:53 2021 +0100

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (211 of 211 strings)

Co-authored-by: bruh 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/vi/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-vi/strings.xml | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-vi/strings.xml 
b/app/src/main/res/values-vi/strings.xml
index 1f6255ae..c66da787 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -80,8 +80,8 @@
 Cổng truy 
cập được đằng sau tường lửa
 Nhập số cổng
 Kích hoạt 
nhật ký gỡ lỗi ở đầu ra (phải dùng adb hoặc aLogCat để 
xem)
-Các trang chủ dự án:
-https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
+Trang chủ dự án:
+https://orbot.app/
 Phần mềm bên thứ 3:
 Tor: https://www.torproject.org
 LibEvent v2.0.21: 
http://www.monkey.org/~provos/libevent/
@@ -127,7 +127,7 @@
 Một ứng dụng muốn mở máy 
chủ onion ở cổng %1$s vào mạng Tor. Việc này là an toàn nếu 
bạn tin tưởng ứng dụng đó.
 OpenSSL: http://www.openssl.org
 Obfs4proxy: 
https://github.com/Yawning/obfs4
-Orbot là một ứng dụng mã nguồn 
mở chứa Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Nó cung cấp một 
proxy HTTP cục bộ (8118) và một proxy SOCKS (9050) vào mạng Tor. 
Orbot cũng có khả năng, trên thiết bị đã root, gửi tất cả 
lưu lượng mạng qua Tor.
+Orbot là một ứng dụng mã nguồn 
mở chứa Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Nó cung cấp một 
proxy HTTP cục bộ (8118) và một proxy SOCKS (9050) vào mạng 
Tor.
 Cho phép những người dùng Tor 
khác kết nối đến Tor qua thiết bị của bạn
 Chạy proxy Snowflake
 Kết nối qua các thiết bị Tor 
ngang hàng khác (thử nghiệm)
@@ -214,7 +214,9 @@
 Toàn cầu (Tự động)
 Chế độ VPN
 Yêu cầu cầu nối qua 
Email
-Chỉ khi thiết bị được 
cắm điện và có Wi-Fi
+Chỉ khi thiết bị đang 
sạc và có Wi-Fi
 Giới hạn Proxy 
Snowflake
-CHẾ ĐỘ PROXY SNOWFLAKE ĐÃ 
BẬT
+Chế độ proxy Snowflake đang 
bật
+Phiên bản:
+Giấy phép:
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Portuguese (Brazil))

[n8fr8]

commit 41cf5d375662dfda70fab935e3aa989e374bcb27
Author: Wellington Terumi Uemura 
Date:   Fri Dec 3 08:50:52 2021 +0100

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (211 of 211 strings)

Co-authored-by: Wellington Terumi Uemura 
Translate-URL: 
https://hosted.weblate.org/projects/guardianproject/orbot/pt_BR/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-pt-rBR/strings.xml | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml 
b/app/src/main/res/values-pt-rBR/strings.xml
index 89686755..a7efd89a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -18,7 +18,7 @@
 Escanear um BridgeQR
 Compartilhar o BridgeQR
 
-O Orbot é um software de código aberto 
que contem Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Ele fornece um proxy 
local HTTP (8118) e um proxy SOCKS (9050) como acesso a rede Tor. Orbot também 
tem a habilidade, em dispositivos com acesso root, de enviar todo o trafego de 
Internet via rede Tor.
+O Orbot é um software de código aberto 
que contem Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Ele fornece um proxy 
local HTTP (8118) e um proxy SOCKS (9050) como acesso a rede Tor.
 
 Geral
 Iniciar o Orbot durante o 
Boot
@@ -81,8 +81,8 @@
 Portas 
atingíveis atrás de um firewall restritivo
 Insira as portas
 Ativar os 
registros log de depuração para saída (deve usar adb ou aLogCat para 
ver)
-Home(s) do Projeto: 
-https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
+Site do projeto:
+https://orbot.app/
 Software de Terceiros:
 Tor: https://www.torproject.org
 LibEvent v2.0.21: 
http://www.monkey.org/~provos/libevent/
@@ -216,5 +216,7 @@
 Erro: Um serviço Onion já está usando 
a porta %s
 Somente quando o dispositivo 
está conectado e na rede Wi-Fi
 Limites do proxy 
snowflake
-MODO DE PROXY SNOWFLAKE 
ATIVADO
+Modo proxy snowflake 
ativado
+Versão:
+Licença:
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Vietnamese)

[n8fr8]

commit a8057ced252b0eef8cf6d9f0827f9fc93f3f28a9
Author: Allan Nordhøy 
Date:   Fri Dec 3 08:50:50 2021 +0100

Translated using Weblate (Vietnamese)

Currently translated at 95.7% (202 of 211 strings)

Translated using Weblate (Romanian)

Currently translated at 95.2% (201 of 211 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (211 of 211 strings)

Translated using Weblate (Italian)

Currently translated at 93.3% (197 of 211 strings)

Translated using Weblate (Finnish)

Currently translated at 95.2% (201 of 211 strings)

Translated using Weblate (English)

Currently translated at 100.0% (211 of 211 strings)

Translated using Weblate (English)

Currently translated at 100.0% (211 of 211 strings)

Co-authored-by: Allan Nordhøy 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/en/
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/fi/
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/it/
Translate-URL: 
https://hosted.weblate.org/projects/guardianproject/orbot/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/ro/
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/vi/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-fi/strings.xml |  2 +-
 app/src/main/res/values-it/strings.xml |  2 +-
 app/src/main/res/values-pt-rBR/strings.xml |  2 +-
 app/src/main/res/values-ro-rRO/strings.xml |  2 +-
 app/src/main/res/values-vi/strings.xml |  2 +-
 app/src/main/res/values/strings.xml| 56 +-
 6 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/app/src/main/res/values-fi/strings.xml 
b/app/src/main/res/values-fi/strings.xml
index 3537eaf9..7b66cc18 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -162,7 +162,7 @@
 Varmuuskopioi asiakasohjelman 
tunnistautumisavain
 x25519 Yksityinen avain Base 32:ssa
 SNOWFLAKE-VÄLITYSPALVELINTILA 
SALLITTU
-Vain, kun laite on kytkettynä ja 
wifi-yhteydessä
+Vain, kun laite on kytkettynä ja 
Wi-Fi-yhteydessä
 Snowflake-välityspalvelimen 
rajoitukset
 Salli muiden Tor-käyttäjien 
yhdistää Toriin laitteesi kautta
 Käytä 
Snowflake-välityspalvelinta
diff --git a/app/src/main/res/values-it/strings.xml 
b/app/src/main/res/values-it/strings.xml
index a874857d..101c895e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -195,7 +195,7 @@
 Nega
 Permetti
 MODALITÀ PROXY SNOWFLAKE 
ATTIVA
-Solo quando il dispositivo è 
collegato e su wifi
+Solo quando il dispositivo è 
collegato e su Wi-Fi
 Limiti del proxy 
Snowflake
 Permetti ad altri utenti di Tor di 
connettersi a Tor tramite il tuo dispositivo
 Avvia proxy Snowflake
diff --git a/app/src/main/res/values-pt-rBR/strings.xml 
b/app/src/main/res/values-pt-rBR/strings.xml
index 2408a3bf..89686755 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -214,7 +214,7 @@
 Negue
 Permita
 Erro: Um serviço Onion já está usando 
a porta %s
-Somente quando o dispositivo 
está conectado e na rede wifi
+Somente quando o dispositivo 
está conectado e na rede Wi-Fi
 Limites do proxy 
snowflake
 MODO DE PROXY SNOWFLAKE 
ATIVADO
 
\ No newline at end of file
diff --git a/app/src/main/res/values-ro-rRO/strings.xml 
b/app/src/main/res/values-ro-rRO/strings.xml
index 1a048c02..177817e2 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -41,7 +41,7 @@
 Orbot începe…
 Orbot este o aplicație proxy gratuită 
care permite altor aplicații să utilizeze internetul în condiții de mai 
mare siguranță. Orbot folosește Tor pentru a vă cripta traficul de internet 
și apoi îl ascunde trecând printr-o serie de calculatoare din întreaga 
lume. Tor este un software gratuit și o rețea deschisă care vă ajută să 
vă apărați împotriva unei forme de supraveghere a rețelei care amenință 
libertatea și intimitatea personală, activitățile și relațiile de afaceri 
confidențiale și securitatea statului, cunoscută sub numele de analiză a 
traficului.
 Orbot
-Numai atunci când dispozitivul 
este conectat la priză și pe wifi
+Numai atunci când dispozitivul 
este conectat la priză și pe Wi-Fi
 Limitele Proxy Snowflake
 Permiteți altor utilizatori Tor să se 
conecteze la Tor prin intermediul dispozitivului dumneavoastră
 Rulați Snowflake Proxy
diff --git a/app/src/main/res/values-vi/strings.xml 
b/app/src/main/res/values-vi/strings.xml
index 8ed80903..1f6255ae 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ 

[tor-commits] [orbot/master] Translated using Weblate (Lithuanian)

[n8fr8]

commit 5bd6165d8a7a997aae63a3bb3cc8211b7a09d75a
Author: g 
Date:   Fri Dec 3 08:50:51 2021 +0100

Translated using Weblate (Lithuanian)

Currently translated at 100.0% (211 of 211 strings)

Co-authored-by: g 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/lt/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-lt-rLT/strings.xml | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-lt-rLT/strings.xml 
b/app/src/main/res/values-lt-rLT/strings.xml
index 7fbbea79..9ebbeb72 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -13,7 +13,7 @@
 Orbot
 Įveskite neįtrauktinus mazgus
 Jūsų pasiekiamų 
adresų nustatymai sukėlė išimtį!
-Tik tada, kai įrenginys 
prijungtas prie maitinimo šaltinio ir naudoja „Wi-Fi“
+Tik tada, kai įrenginys kraunasi 
ir naudoja „Wi-Fi“
 Leisti kitiems „Tor“ vartotojams 
prisijungti prie „Tor“ per jūsų įrenginį
 Nurodo išėjimams nesijungti 
prie IPv4 adresų
 Nurodo, kad pirmenybė teikiama 
IPv6 adresams
@@ -34,7 +34,7 @@
 Pirštų atspaudai, 
slapyvardžiai, šalys ir adresai, kurių nereikia paskutiniam šuoliui
 Pirštų 
atspaudai, slapyvardžiai, šalys ir adresai, pirmajam šuoliui
 Pirštų 
atspaudai, slapyvardžiai, šalys ir adresai, kurių nereikia traukti
-x25519 privatus raktas 32 bazėje
+x25519 privatus raktas Base32
 Prisijungti per kitus „Tor“ sujungimus 
(eksperimentinis)
 Išspręskite CAPTCHA, kad 
galėtumėte prašyti tiltų.
 Prievadai, 
pasiekiami už ribojančiosios ugniasienės
@@ -146,8 +146,7 @@
 Obfs4proxy: 
https://github.com/Yawning/obfs4
 LibEvent: 
http://www.monkey.org/~provos/libevent/
 Tor: https://www.torproject.org
-https://www.torproject.org/docs/android
-\nhttps://guardianproject.info/apps/orbot/
+https://orbot.app/
 Projekto namai:
 Įvesti prievadus
 Pasiekiami prievadai
@@ -194,7 +193,7 @@
 Leisti 
„Wi-Fi“ poroms, pririštiems įrenginiams ir visiems kitiems, kurie gali 
prisijungti prie jūsų IP, pasiekti „Tor“
 Programėlė nori atidaryti 
„Tor“ tinklo prievado %1$s onion serverį. Tai saugu, jei pasitikite 
programėle.
 Jei
 jūsų mobiliojo ryšio tinklas aktyviai blokuoja „Tor“, galite naudoti 
„tilto serverį“ kaip alternatyvų prisijungimo būdą. Pasirinkite vieną 
iš parinkčių, kad galėtumėte konfigūruoti ir išbandyti…
-„Orbot“ yra atvirojo kodo programa, 
kurią sudaro „Tor“, „Obfs4Proxy“, „BadVPN“, „Tun2Socks“ ir 
„LibEvent“. Ji suteikia vietinį HTTP įgaliotąjį (proxy) serverį (8118) 
ir SOCKS įgaliotąjį serverį (9050) į „Tor“ tinklą. „Orbot“ taip 
pat turi galimybę įsišaknijusiame įrenginyje visą interneto srautą 
siųsti per „Tor“.
+„Orbot“ yra atvirojo kodo programa, 
kurią sudaro „Tor“, „Obfs4Proxy“, „BadVPN“, „Tun2Socks“ ir 
„LibEvent“. Ji suteikia vietinį HTTP įgaliotąjį (proxy) serverį (8118) 
ir SOCKS įgaliotąjį serverį (9050) į „Tor“ tinklą.
 Perdavimas
 Bendrieji
 Žurnalas
@@ -217,5 +216,7 @@
 Sustabdyti
 Pradėti
 „Orbot“ yra nemokama įgaliotojo 
serverio programa, kuri leidžia kitoms programoms saugiau naudotis internetu. 
„Orbot“ naudoja „Tor“, kad užšifruotų jūsų interneto srautą ir 
paslėptų jį per kelis kompiuterius visame pasaulyje. „Tor“ yra nemokama 
programinė įranga ir atviras tinklas, padedantis apsisaugoti nuo tinklo 
stebėjimo, keliančio grėsmę asmens laisvei ir privatumui, konfidencialiai 
verslo veiklai ir santykiams bei valstybės saugumui, vadinamo srauto 
analize.
-„SNOWFLAKE“ ĮGALIOTOJO 
SERVERIO REŽIMAS ĮJUNGTAS
+„Snowflake“ įgaliotojo 
serverio rėžimas įjungtas
+Versija:
+Licencija:
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Persian)

[n8fr8]

commit 57f2f7fda434dcbb305b0325332b111008b244c3
Author: Danial Behzadi 
Date:   Fri Dec 3 08:50:51 2021 +0100

Translated using Weblate (Persian)

Currently translated at 35.0% (7 of 20 strings)

Translated using Weblate (Persian)

Currently translated at 87.6% (185 of 211 strings)

Translated using Weblate (Persian)

Currently translated at 87.2% (184 of 211 strings)

Translated using Weblate (Persian)

Currently translated at 86.7% (183 of 211 strings)

Co-authored-by: Danial Behzadi 
Translate-URL: 
https://hosted.weblate.org/projects/guardianproject/orbot-metadata/fa/
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/fa/
Translation: Guardian Project/Orbot
Translation: Guardian Project/Orbot metadata
---
 app/src/main/res/values-fa/strings.xml | 81 +++---
 .../metadata/android/fa/changelogs/1610.txt|  2 +-
 .../metadata/android/fa/changelogs/1611.txt|  2 +-
 fastlane/metadata/android/fa/full_description.txt  | 21 --
 fastlane/metadata/android/fa/short_description.txt |  2 +-
 5 files changed, 75 insertions(+), 33 deletions(-)

diff --git a/app/src/main/res/values-fa/strings.xml 
b/app/src/main/res/values-fa/strings.xml
index 242bd8b9..e50df89f 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1,10 +1,10 @@
 
 
 روبات پیازی
-اربت یک برنامه پروکسی م
جانی است که دیگر برنامه ها را به استفاده امن 
از اینترنت توانمند می کند . اربوت از تور 
برای رمزگذاری کردن ترافیک اینترنت شما 
استفاده می کند و بعد آن ها را از طریق کام
پیوترهای متفاوت در نقاط مختلف جهان مخفی می 
کند. تور یک برنامه مجانی و شبکه باز است که شم
ا از شما در مقابل تحت نظر بودن در شبکه٬‌  
تهدید آزادی های شخصی٬ خصوصی٬ فعالیت های 
کاری و رابطه های شخصی بطور امن محافظت می 
کند. 
+روبات پیازی، یک کارهٔ 
پیشکار آزاد است که دیگر کاره‌ها را در 
استفاده امن از اینترنت توانمند می‌کند . 
روبات پیازی برای رمزگذاری شدآمد اینترنتتان 
و نهفتنش با عبور از میان دنباله‌ای از 
رایانه‌ها در سراسر جهان، از تور استفاده م
ی‌کند. تور نرم‌افزار آزاد و شبکه‌ای باز 
است که به شما در برابر شکلی از نظارت شبکه با 
نام تجزیهٔ شدآمد که محرمانگی و آزادی فردی، 
فعّالیت‌های تجاری محرمانه و امنیت ملی را 
تهدید می‌کند، یاری می‌رساند.
 اربوت درحال آغاز 
است…
 متصل به شبکه تور
-اربوت غیرفعال شده 
است.
+روبات پیازی از کار 
افتاده
 سرویس تور در حال خام
وش شدن است
 تنظیمات
 ورود
@@ -15,10 +15,10 @@
 آپلود
 درباره
 خروج
-اسکن BridgeQR
-اشتراک BridgeQR
+پویش BridgeQR
+هم‌رسانی BridgeQR
 
-اوربات نرم‌افزاری 
آزاد است که شامل تور، Obfs4Proxy، BadVPN، Tun2Socks، 
LibEvent و پولیپو می‌شود. این نرم‌افزار یک 
اچ‌تی‌تی‌پی پراکسی (8118) و ساکس (9050) محلی 
روی شبکه تور فراهم می‌کند. همچنین اوربات م
ی‌تواند روی دستگاه‌های روت شده، تمام 
ترافیک اینترنت را ار تور عبور دهد.
+روبات پیازی نرم
‌افزاری آزاد است که شامل تور، Obfs4Proxy، BadVPN، 
Tun2Socks و LibEvent می‌شود. این نرم‌افزار یک 
پیشکار اچ‌تی‌تی‌پی (۸۱۱۸) و یک پیشکار ساکس 
(۹۰۵۰) محلّی به شبکهٔ تور فراهم می‌کند.
 
 کلی
 اوربوت را همزمان با 
بوت آغاز کن
@@ -55,7 +55,7 @@
  تور نتواست اجرا 
شود:
 خطا
 تنظیمات شم
ا برای آدرس قابل دسترسی باعث ایجاد خطا شده 
اند !
-تنظیمات 
رله شما موجب خطا شده اند
+تنظیمات 
رله‌تان شما موجب خطایی شده!
 گره های خروجی
 اثر 
انگشتها ، اسامی مستعار ، کشورها و آدرسها 
برای آخرین جهش 
  گره های خروجی را وارد 
کنید
@@ -64,8 +64,8 @@
  گره هایی که نباید 
استفاده شوند
 گره های محدود
 فقط * از این 

[tor-commits] [orbot/master] Translated using Weblate (Indonesian)

[n8fr8]

commit 171ceac1344ee60f37cd891acf4919c6bfa34de0
Author: Reza Almanda 
Date:   Fri Dec 3 08:50:50 2021 +0100

Translated using Weblate (Indonesian)

Currently translated at 60.8% (135 of 222 strings)

Co-authored-by: Reza Almanda 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/id/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-in/strings.xml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/res/values-in/strings.xml 
b/app/src/main/res/values-in/strings.xml
index 84e61051..b4242d8e 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -132,4 +132,14 @@
 Port yang Tor menawarkan proxy HTTP-nya 
(standar: 8118 atau 0 untuk mematikan)
 Ada masalah saat menyambung\?
 .onion
+Buka Proxy di Semua 
Antarmuka
+Konfigurasi Port HTTP
+Minta Bridges melalui 
Email
+Global (Otomatis)
+Layanan Onion
+Layanan Onion v2 (Usang)
+Layanan Onion v3 Yang Dihosting
+Otorisasi Klien Layanan Onion v3
+Otorisasi Klien v3
+Gunakan Kode QR
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] removed unused v2 constant from OrbotService

[n8fr8]

commit 3fbda17902ffde49d898d1477e8fe4ef37b95217
Author: b 
Date:   Fri Dec 10 01:21:14 2021 -0500

removed unused v2 constant from OrbotService
---
 app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 +-
 .../main/java/org/torproject/android/service/TorServiceConstants.java   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index e0079b94..3853f957 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -804,7 +804,7 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 
 }
 
-
+
 if (autoStartFromIntent) {
 autoStartFromIntent = false;
 Intent resultIntent = lastStatusIntent;
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
 
b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
index d2a71788..02ab7429 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
@@ -99,7 +99,6 @@ public interface TorServiceConstants {
 //obfsproxy
 String OBFSCLIENT_ASSET_KEY = "obfs4proxy";
 
-String HIDDEN_SERVICES_DIR = "hidden_services";
 String ONION_SERVICES_DIR = "v3_onion_services";
 String V3_CLIENT_AUTH_DIR = "v3_client_auth";
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Fixes #549 snowflake preferences are greyed on when bridges are in use

[n8fr8]

commit 2cc79c18342a912549e9e054f1d0001917f4265f
Author: b 
Date:   Fri Dec 10 00:41:17 2021 -0500

Fixes #549 snowflake preferences are greyed on when bridges are in use
also added string res for snowflake proxy category so it can be localized
---
 app/src/main/res/values/strings.xml  | 3 ++-
 app/src/main/res/xml/preferences.xml | 2 +-
 .../org/torproject/android/core/ui/SettingsPreferencesActivity.kt| 5 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index e1310d85..c3a43f01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -251,9 +251,10 @@
 In a browser, visit %s and tap "Get Bridges" > 
"Just Give Me Bridges!"
 Paste Bridges
 Use QR Code
+Snowflake Proxy 
(Experimental)
 Connect through other Tor peers 
(experimental)
 Run Snowflake Proxy
-Allow other Tor users to connect to Tor 
through your device
+Allow other Tor users to connect to Tor 
through your device. (This can\'t be used if you connect alongside 
bridges)
 
 Snowflake Proxy Limits
 Only when device is plugged in 
and on wifi
diff --git a/app/src/main/res/xml/preferences.xml 
b/app/src/main/res/xml/preferences.xml
index 28e06052..0b2eb525 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -291,7 +291,7 @@
 android:title="@string/pref_disable_network_title" />
 
 
-
+
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Update .gitlab-ci.yml file

[n8fr8]

commit 84f0be7c742b7dde2886a45716510a2864b8b839
Author: Nathan Freitas 
Date:   Wed Nov 10 15:51:56 2021 +

Update .gitlab-ci.yml file
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e12e5f5..0e2fac61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,9 @@
 image: openjdk:11-jdk
 
 variables:
-ANDROID_COMPILE_SDK: "30"
-ANDROID_BUILD_TOOLS: "30.0.3"
-ANDROID_SDK_TOOLS: "6858069_latest"
+  ANDROID_COMPILE_SDK: "30"
+  ANDROID_BUILD_TOOLS: "30.0.3"
+  ANDROID_SDK_TOOLS: "6858069_latest"
 
 
 before_script:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Cleaned up About Dialog:

[n8fr8]

commit aa48f6b6a6c152157e6454c5073aaecb55c5a014
Author: bim 
Date:   Sat Nov 6 13:03:03 2021 -0400

Cleaned up About Dialog:
- Gave it andorid material padding so view is centered
- Removed redundant "some orbot details" string under "About"
- Used consistent colors with other parts of app
- Migrated hardcoded english strings to string res so dialog can be better 
localized
---
 app/src/main/res/layout/layout_about.xml   | 67 +++---
 app/src/main/res/values-ar/strings.xml |  1 -
 app/src/main/res/values-ay/strings.xml |  3 +-
 app/src/main/res/values-az/strings.xml |  1 -
 app/src/main/res/values-be/strings.xml |  3 +-
 app/src/main/res/values-bg/strings.xml |  1 -
 app/src/main/res/values-bn-rBD/strings.xml |  1 -
 app/src/main/res/values-bn/strings.xml |  1 -
 app/src/main/res/values-ca/strings.xml |  1 -
 app/src/main/res/values-cs-rCZ/strings.xml |  1 -
 app/src/main/res/values-cs/strings.xml |  1 -
 app/src/main/res/values-cy/strings.xml |  1 -
 app/src/main/res/values-da/strings.xml |  1 -
 app/src/main/res/values-de/strings.xml |  1 -
 app/src/main/res/values-el/strings.xml |  1 -
 app/src/main/res/values-en-rGB/strings.xml |  1 -
 app/src/main/res/values-eo/strings.xml |  1 -
 app/src/main/res/values-es-rAR/strings.xml |  3 +-
 app/src/main/res/values-es/strings.xml |  1 -
 app/src/main/res/values-et/strings.xml |  1 -
 app/src/main/res/values-eu/strings.xml |  1 -
 app/src/main/res/values-fa/strings.xml |  1 -
 app/src/main/res/values-fi/strings.xml |  1 -
 app/src/main/res/values-fr-rFR/strings.xml |  1 -
 app/src/main/res/values-fr/strings.xml |  3 +-
 app/src/main/res/values-gl/strings.xml |  1 -
 app/src/main/res/values-hi/strings.xml |  1 -
 app/src/main/res/values-hr/strings.xml |  3 +-
 app/src/main/res/values-hu/strings.xml |  1 -
 app/src/main/res/values-in/strings.xml |  1 -
 app/src/main/res/values-is/strings.xml |  1 -
 app/src/main/res/values-it/strings.xml |  1 -
 app/src/main/res/values-iw/strings.xml |  1 -
 app/src/main/res/values-ja/strings.xml |  1 -
 app/src/main/res/values-ko/strings.xml |  1 -
 app/src/main/res/values-lt-rLT/strings.xml |  1 -
 app/src/main/res/values-lt/strings.xml |  3 +-
 app/src/main/res/values-lv/strings.xml |  1 -
 app/src/main/res/values-mk/strings.xml |  1 -
 app/src/main/res/values-ms-rMY/strings.xml |  1 -
 app/src/main/res/values-ms/strings.xml |  1 -
 app/src/main/res/values-nb/strings.xml |  1 -
 app/src/main/res/values-nl/strings.xml |  1 -
 app/src/main/res/values-pl/strings.xml |  1 -
 app/src/main/res/values-pt-rBR/strings.xml |  1 -
 app/src/main/res/values-pt-rPT/strings.xml |  1 -
 app/src/main/res/values-pt/strings.xml |  1 -
 app/src/main/res/values-ro-rRO/strings.xml |  1 -
 app/src/main/res/values-ro/strings.xml |  1 -
 app/src/main/res/values-ru/strings.xml |  1 -
 app/src/main/res/values-si-rLK/strings.xml |  1 -
 app/src/main/res/values-sk-rSK/strings.xml |  1 -
 app/src/main/res/values-sk/strings.xml |  1 -
 app/src/main/res/values-sl/strings.xml |  1 -
 app/src/main/res/values-sq/strings.xml |  1 -
 app/src/main/res/values-sr/strings.xml |  3 +-
 app/src/main/res/values-sv/strings.xml |  1 -
 app/src/main/res/values-ta/strings.xml |  1 -
 app/src/main/res/values-th/strings.xml |  1 -
 app/src/main/res/values-tl/strings.xml |  1 -
 app/src/main/res/values-tr/strings.xml |  1 -
 app/src/main/res/values-uk/strings.xml |  1 -
 app/src/main/res/values-vi/strings.xml |  1 -
 app/src/main/res/values-zh-rCN/strings.xml |  1 -
 app/src/main/res/values-zh-rTW/strings.xml |  3 +-
 app/src/main/res/values/strings.xml|  3 +-
 66 files changed, 34 insertions(+), 116 deletions(-)

diff --git a/app/src/main/res/layout/layout_about.xml 
b/app/src/main/res/layout/layout_about.xml
index 47f9e695..be4490c6 100644
--- a/app/src/main/res/layout/layout_about.xml
+++ b/app/src/main/res/layout/layout_about.xml
@@ -8,33 +8,24 @@
 
-
-
+android:orientation="vertical"
+android:paddingLeft="?dialogPreferredPadding"
+android:paddingRight="?dialogPreferredPadding">
 
 
+android:textColor="@android:color/white"
+android:textColorLink="@android:color/white" />
 
 
 
 
+android:textColor="@android:color/white" />
 
 
 
 
+android:textColor="@android:color/white"
+android:textColorLink="@android:color/white" />
 
 
 
 
+android:textColor="@android:color/white"
+android:textColorLink="@android:color/white" />
 
 
+android:textColor="@android:color/white"
+android:textColorLink="@android:color/white" />
 
 
+android:textColor="@android:color/white"
+

[tor-commits] [orbot/master] return val of pluggableTransportsInstall always the same + never used

[n8fr8]

commit 2637e1f05b26a3c23d59e1a4e467433e449d4698
Author: b 
Date:   Fri Dec 10 00:57:44 2021 -0500

return val of pluggableTransportsInstall always the same + never used
---
 app/src/main/java/org/torproject/android/OrbotMainActivity.java   | 2 +-
 .../src/main/java/org/torproject/android/service/OrbotService.java| 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 3853f957..e0079b94 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -804,7 +804,7 @@ public class OrbotMainActivity extends AppCompatActivity 
implements OrbotConstan
 
 }
 
-
+
 if (autoStartFromIntent) {
 autoStartFromIntent = false;
 Intent resultIntent = lastStatusIntent;
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 2f189a08..4b9a12e6 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -502,7 +502,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 return mCurrentStatus;
 }
 
-private boolean pluggableTransportInstall() {
+private void pluggableTransportInstall() {
 
 File fileCacheDir = new File(getCacheDir(), "pt");
 if (!fileCacheDir.exists())
@@ -511,8 +511,6 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 IPtProxy.setStateLocation(fileCacheDir.getAbsolutePath());
 String fileTestState = IPtProxy.getStateLocation();
 debug("IPtProxy state: " + fileTestState);
-
-return false;
 }
 
 private File updateTorrcCustomFile() throws IOException, TimeoutException {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] made setEnabled() call null safe

[n8fr8]

commit a1d04487b4e2caf5204ff03385fbdf660e356293
Author: bitmold 
Date:   Fri Dec 10 14:29:11 2021 -0500

made setEnabled() call null safe

didn't see this
---
 .../org/torproject/android/core/ui/SettingsPreferencesActivity.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt
 
b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt
index 04dd6266..79f00544 100644
--- 
a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt
+++ 
b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt
@@ -34,7 +34,7 @@ class SettingsPreferencesActivity : PreferenceActivity() {
 
 val bridgesEnabled = 
getSharedPreferences("org.torproject.android_preferences", 
MODE_MULTI_PROCESS).getBoolean("pref_bridges_enabled", false)
 findPreference("pref_be_a_snowflake")?.isEnabled = !bridgesEnabled
-findPreference("pref_be_a_snowflake_limit").isEnabled = !bridgesEnabled
+findPreference("pref_be_a_snowflake_limit")?.isEnabled = 
!bridgesEnabled
 }
 
 override fun attachBaseContext(newBase: Context) = 
super.attachBaseContext(LocaleHelper.onAttach(newBase))
@@ -67,4 +67,4 @@ class SettingsPreferencesActivity : PreferenceActivity() {
 putExtra(BUNDLE_KEY_PREFERENCES_XML, xmlPrefId)
 }
 }
-}
\ No newline at end of file
+}



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Update BUILD.md

[n8fr8]

commit afc97fe909b5bcee1f5849e7fbefcdf60ed38ba2
Author: bitmold 
Date:   Tue Dec 7 12:37:37 2021 -0500

Update BUILD.md

Removed submodule that Orbot no longer has (as a git submodule), added 
syntax coloring
---
 BUILD.md | 50 ++
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/BUILD.md b/BUILD.md
index 28b636a1..3575b117 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -1,8 +1,6 @@
-This document explains how to properly build an Android package of Orbot from
-source.
+# Building Orbot 
 
-Orbot includes, in the external directory, git repo submodules of:
-- JTorControl: The Tor Control Library for Java
+Orbot includes, in the external directory, git submodules of:
 - BadVPN
 - JSocks
 
@@ -12,29 +10,33 @@ Please install the following prerequisites (instructions 
for each follows):
 - Android Native Development Kit or NDK (for C/C++ code) 
http://developer.android.com/sdk/ndk/index.html *(This can be installed through 
Android Studio's SDK Manager)*
 
 Be sure that you have all of the git submodules up-to-date:
-
-   git submodule update --init --recursive
-
+```bash
+git submodule update --init --recursive
+```
 
 You then need to run "ndk-build" and the following commands to compile and 
prepare Orbot's native code:
 
-UNIX:  
-   
-   cd orbotservice/src/main
-   ndk-build (located in Android/Sdk/ndk/VERSION/)
-   mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/libpdnsd.so
-   mv libs/arm64-v8a/pdnsd libs/arm64-v8a/libpdnsd.so
-   mv libs/x86/pdnsd libs/x86/libpdnsd.so
-   mv libs/x86_64/pdnsd libs/x86_64/libpdnsd.so
-
-Windows:
-
-   cd orbotservice\src\main
-   ndk-build.cmd (located in Android\Sdk\ndk\VERSION\) 
-   ren libs\armeabi-v7a\pdnsd libpdnsd.so
-   ren libs\arm64-v8a\pdnsd libpdnsd.so
-   ren libs\x86\pdnsd libpdnsd.so
-   ren libs\x86_64\pdnsd libpdnsd.so
+## UNIX based 
+
+```bash
+cd orbotservice/src/main
+ndk-build #(located in Android/Sdk/ndk/VERSION/)
+mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/libpdnsd.so
+mv libs/arm64-v8a/pdnsd libs/arm64-v8a/libpdnsd.so
+mv libs/x86/pdnsd libs/x86/libpdnsd.so
+mv libs/x86_64/pdnsd libs/x86_64/libpdnsd.so
+```
+
+## Windows
+
+```bat
+cd orbotservice\src\main
+ndk-build.cmd (located in Android\Sdk\ndk\VERSION\) 
+ren libs\armeabi-v7a\pdnsd libpdnsd.so
+ren libs\arm64-v8a\pdnsd libpdnsd.so
+ren libs\x86\pdnsd libpdnsd.so
+ren libs\x86_64\pdnsd libpdnsd.so
+```
 
 
 Now build the Android app using Android Studio/gradle



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] removed unused FileProvider.xml mentioned in #540

[n8fr8]

commit f989be3edc5cae1e1da163f9ff40ed0d0ce01479
Author: b 
Date:   Thu Dec 9 20:08:49 2021 -0500

removed unused FileProvider.xml mentioned in #540
---
 app-tv/src/main/res/xml/hidden_services_paths.xml |  4 
 app/src/main/AndroidManifest.xml  | 10 --
 app/src/main/res/xml/hidden_services_paths.xml|  4 
 3 files changed, 18 deletions(-)

diff --git a/app-tv/src/main/res/xml/hidden_services_paths.xml 
b/app-tv/src/main/res/xml/hidden_services_paths.xml
deleted file mode 100644
index 073732b6..
--- a/app-tv/src/main/res/xml/hidden_services_paths.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-http://schemas.android.com/apk/res/android;>
-
-
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9e8a452a..f9a0838c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -139,16 +139,6 @@
 
android:name=".ui.v3onionservice.clientauth.ClientAuthContentProvider"
 android:exported="false"/>
 
-
-
-
-
 
-
-
-
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge pull request #543 from tladesignz/master

[n8fr8]

commit 8e5cc3a7779d8931d734cb6475fb281fdedae901
Merge: 68b3104a 80e92e9d
Author: bitmold 
Date:   Thu Nov 18 11:20:30 2021 -0500

Merge pull request #543 from tladesignz/master

Fixed some random compiler warnings, while reading through the code.

 app/src/main/AndroidManifest.xml| 13 +
 .../java/org/torproject/android/service/OrbotService.java   |  8 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Fixed some random compiler warnings, while reading through the code.

[n8fr8]

commit 80e92e9d4e0bb55a986b4dff63d225cc4a0e4134
Author: Benjamin Erhart 
Date:   Tue Nov 16 13:09:21 2021 +0100

Fixed some random compiler warnings, while reading through the code.
---
 app/src/main/AndroidManifest.xml| 13 +
 .../java/org/torproject/android/service/OrbotService.java   |  8 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3779e386..9e8a452a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,7 +44,8 @@
 
+android:launchMode="singleTop"
+android:exported="true">
 
 
 
@@ -70,8 +71,9 @@
 
 
 
- 
+
 
+
 
-
+
+
 
 
 
@@ -172,7 +176,8 @@
 android:name=".service.OrbotService"
 android:enabled="true"
 android:permission="android.permission.BIND_VPN_SERVICE"
-android:stopWithTask="false">
+android:stopWithTask="false"
+android:exported="true">
 
 
 
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 280d26e3..2f189a08 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -74,6 +74,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeoutException;
 
 import IPtProxy.IPtProxy;
+
+import androidx.annotation.ChecksSdkIntAtLeast;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -110,6 +112,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 public static File appBinHome;
 public static File appCacheHome;
 private final ExecutorService mExecutor = Executors.newCachedThreadPool();
+@ChecksSdkIntAtLeast(api = Build.VERSION_CODES.LOLLIPOP)
 boolean mIsLollipop = Build.VERSION.SDK_INT >= 
Build.VERSION_CODES.LOLLIPOP;
 TorEventHandler mEventHandler;
 OrbotVpnManager mVpnManager;
@@ -425,6 +428,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 }
 }
 
+@SuppressWarnings("ResultOfMethodCallIgnored")
 @Override
 public void onCreate() {
 super.onCreate();
@@ -632,7 +636,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 return portString;
 }
 
-public boolean updateTorConfigCustom(File fileTorRcCustom, String 
extraLines) throws IOException, TimeoutException {
+public boolean updateTorConfigCustom(File fileTorRcCustom, String 
extraLines) throws IOException {
 FileWriter fos = new FileWriter(fileTorRcCustom, false);
 PrintWriter ps = new PrintWriter(fos);
 ps.print(extraLines);
@@ -1328,7 +1332,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 Bridge b = new Bridge();
 b.type = st.nextToken();
 
-StringBuffer sbConfig = new StringBuffer();
+StringBuilder sbConfig = new StringBuilder();
 
 while (st.hasMoreTokens())
 sbConfig.append(st.nextToken()).append(' ');



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge branch 'master' of gitlab.com:guardianproject/orbot

[n8fr8]

commit 68b3104ad257393d82f509a3f21d13bae15e2fee
Merge: c3b64f85 84f0be7c
Author: n8fr8 
Date:   Wed Nov 10 10:52:11 2021 -0500

Merge branch 'master' of gitlab.com:guardianproject/orbot




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge branch 'master' of github.com:guardianproject/orbot

[n8fr8]

commit 515d0e52c6c8d9dedb58bb4dab84b12179b45b93
Merge: 2a114a6a aa48f6b6
Author: n8fr8 
Date:   Mon Nov 8 09:44:39 2021 -0500

Merge branch 'master' of github.com:guardianproject/orbot

 LICENSE|  4 +-
 app-mini/build.gradle  |  5 +-
 app-tv/build.gradle| 15 -
 app/build.gradle   |  7 +--
 app/src/main/res/layout/layout_about.xml   | 67 --
 app/src/main/res/values-ar/strings.xml |  1 -
 app/src/main/res/values-ay/strings.xml |  3 +-
 app/src/main/res/values-az/strings.xml |  1 -
 app/src/main/res/values-be/strings.xml |  3 +-
 app/src/main/res/values-bg/strings.xml |  1 -
 app/src/main/res/values-bn-rBD/strings.xml |  1 -
 app/src/main/res/values-bn/strings.xml |  1 -
 app/src/main/res/values-ca/strings.xml |  1 -
 app/src/main/res/values-cs-rCZ/strings.xml |  1 -
 app/src/main/res/values-cs/strings.xml |  1 -
 app/src/main/res/values-cy/strings.xml |  1 -
 app/src/main/res/values-da/strings.xml |  1 -
 app/src/main/res/values-de/strings.xml |  1 -
 app/src/main/res/values-el/strings.xml |  1 -
 app/src/main/res/values-en-rGB/strings.xml |  1 -
 app/src/main/res/values-eo/strings.xml |  1 -
 app/src/main/res/values-es-rAR/strings.xml |  3 +-
 app/src/main/res/values-es/strings.xml |  1 -
 app/src/main/res/values-et/strings.xml |  1 -
 app/src/main/res/values-eu/strings.xml |  1 -
 app/src/main/res/values-fa/strings.xml |  1 -
 app/src/main/res/values-fi/strings.xml |  1 -
 app/src/main/res/values-fr-rFR/strings.xml |  1 -
 app/src/main/res/values-fr/strings.xml |  3 +-
 app/src/main/res/values-gl/strings.xml |  1 -
 app/src/main/res/values-hi/strings.xml |  1 -
 app/src/main/res/values-hr/strings.xml |  3 +-
 app/src/main/res/values-hu/strings.xml |  1 -
 app/src/main/res/values-in/strings.xml |  1 -
 app/src/main/res/values-is/strings.xml |  1 -
 app/src/main/res/values-it/strings.xml |  1 -
 app/src/main/res/values-iw/strings.xml |  1 -
 app/src/main/res/values-ja/strings.xml |  1 -
 app/src/main/res/values-ko/strings.xml |  1 -
 app/src/main/res/values-lt-rLT/strings.xml |  1 -
 app/src/main/res/values-lt/strings.xml |  3 +-
 app/src/main/res/values-lv/strings.xml |  1 -
 app/src/main/res/values-mk/strings.xml |  1 -
 app/src/main/res/values-ms-rMY/strings.xml |  1 -
 app/src/main/res/values-ms/strings.xml |  1 -
 app/src/main/res/values-nb/strings.xml |  1 -
 app/src/main/res/values-nl/strings.xml |  1 -
 app/src/main/res/values-pl/strings.xml |  1 -
 app/src/main/res/values-pt-rBR/strings.xml |  1 -
 app/src/main/res/values-pt-rPT/strings.xml |  1 -
 app/src/main/res/values-pt/strings.xml |  1 -
 app/src/main/res/values-ro-rRO/strings.xml |  1 -
 app/src/main/res/values-ro/strings.xml |  1 -
 app/src/main/res/values-ru/strings.xml |  1 -
 app/src/main/res/values-si-rLK/strings.xml |  1 -
 app/src/main/res/values-sk-rSK/strings.xml |  1 -
 app/src/main/res/values-sk/strings.xml |  1 -
 app/src/main/res/values-sl/strings.xml |  1 -
 app/src/main/res/values-sq/strings.xml |  1 -
 app/src/main/res/values-sr/strings.xml |  3 +-
 app/src/main/res/values-sv/strings.xml |  1 -
 app/src/main/res/values-ta/strings.xml |  1 -
 app/src/main/res/values-th/strings.xml |  1 -
 app/src/main/res/values-tl/strings.xml |  1 -
 app/src/main/res/values-tr/strings.xml |  1 -
 app/src/main/res/values-uk/strings.xml |  1 -
 app/src/main/res/values-vi/strings.xml |  1 -
 app/src/main/res/values-zh-rCN/strings.xml |  1 -
 app/src/main/res/values-zh-rTW/strings.xml |  3 +-
 app/src/main/res/values/strings.xml|  9 +--
 dependencies.gradle| 58 +--
 .../torproject/android/service/OrbotService.java   |  2 +-
 72 files changed, 86 insertions(+), 161 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Update .gitlab-ci.yml file

[n8fr8]

commit c3b64f85a44676ee215fcb68ef47d03006b0d4db
Author: Nathan Freitas 
Date:   Mon Nov 8 15:44:46 2021 +

Update .gitlab-ci.yml file
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e12e5f5..0e2fac61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,9 @@
 image: openjdk:11-jdk
 
 variables:
-ANDROID_COMPILE_SDK: "30"
-ANDROID_BUILD_TOOLS: "30.0.3"
-ANDROID_SDK_TOOLS: "6858069_latest"
+  ANDROID_COMPILE_SDK: "30"
+  ANDROID_BUILD_TOOLS: "30.0.3"
+  ANDROID_SDK_TOOLS: "6858069_latest"
 
 
 before_script:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update gitlab CI for Android 30 Java 11

[n8fr8]

commit 2a114a6a07be442b7e34fe8e91a41112413bc241
Author: n8fr8 
Date:   Mon Nov 8 09:44:21 2021 -0500

update gitlab CI for Android 30 Java 11
---
 .gitlab-ci.yml   | 37 +++--
 app/build.gradle |  2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3095a87..5e12e5f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,26 @@
-image: openjdk:8-jdk
+image: openjdk:11-jdk
 
 variables:
-  ANDROID_COMPILE_SDK: "28"
-  ANDROID_BUILD_TOOLS: "28.0.2"
-  ANDROID_SDK_TOOLS:   "4333796"
+ANDROID_COMPILE_SDK: "30"
+ANDROID_BUILD_TOOLS: "30.0.3"
+ANDROID_SDK_TOOLS: "6858069_latest"
+
 
 before_script:
-  - apt-get --quiet update --yes
-  - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
-  - wget --quiet --output-document=android-sdk.zip 
https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip
-  - unzip -qq -d android-sdk-linux android-sdk.zip
-  - echo y | android-sdk-linux/tools/bin/sdkmanager 
"platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null
-  - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null
-  - echo y | android-sdk-linux/tools/bin/sdkmanager 
"build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
-  - chmod +x ./gradlew
-  # temporarily disable checking for EPIPE error and use yes to accept all 
licenses
-  - set +o pipefail
-  - yes | android-sdk-linux/tools/bin/sdkmanager --licenses
-  - set -o pipefail
+- apt-get --quiet update --yes
+- apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
+- wget --quiet --output-document=android-sdk.zip 
https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}.zip
+- unzip -d android-sdk-linux android-sdk.zip
+- echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. 
"platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null
+- echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. 
"platform-tools" >/dev/null
+- echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. 
"build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null
+- export ANDROID_SDK_ROOT=$PWD
+- export PATH=$PATH:$PWD/platform-tools/
+- chmod +x ./gradlew
+# temporarily disable checking for EPIPE error and use yes to accept all 
licenses
+- set +o pipefail
+- yes | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. --licenses
+- set -o pipefail
 
 stages:
   - build
diff --git a/app/build.gradle b/app/build.gradle
index 93304560..97549791 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,4 +72,4 @@ android {
 )
 androidTestImplementation libs.fastlane_screengrab
 }
-}
\ No newline at end of file
+}



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Closes #537 updated some copy too...

[n8fr8]

commit 9c23f79d141e2e472e44d1c3f347c48d6bc55db0
Author: bim 
Date:   Sat Nov 6 12:47:41 2021 -0400

Closes #537 updated some copy too...
---
 LICENSE | 4 ++--
 app/src/main/res/values/strings.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/LICENSE b/LICENSE
index 194b99d9..03ad8a80 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,10 @@
 This file contains the license for Orbot, a free software project to
-provide anonymity on the Internet from a Google Android smartphone.
+provide anonymity on the Internet from a Google Android device.
 
 It also lists the licenses for other components used by Orbot, including 
 Tor, and iptables.
 
-For more information about Orbot, see 
https://guardianproject.info/apps/org.torproject.android/
+For more information about Orbot, see https://orbot.app/
 
 If you got this file as a part of a larger bundle, there may be other
 license terms that you should be aware of.
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 7936af5b..a6dbbe00 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
 Share BridgeQR
 
 Some Orbot Details
-Orbot is an open-source application that 
contains Tor, Obfs4Proxy, BadVPN, Tun2Socks and LibEvent. It provides a local 
HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has 
the ability, on rooted device, to send all internet traffic through 
Tor.
+Orbot is an open-source application that 
contains Tor, Obfs4Proxy, BadVPN, Tun2Socks and LibEvent. It provides a local 
HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network.
 
 General
 Start Orbot on Boot
@@ -90,8 +90,8 @@
 Ports 
reachable behind a restrictive firewall
 Enter ports
 Enable debug 
log to output (must use adb or aLogcat to view)
-Project Home(s): 
-https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
+Project Home:
+https://orbot.app/
 3rd-Party-Software: 
 Tor: https://www.torproject.org
 LibEvent: 
http://www.monkey.org/~provos/libevent/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Fix typo in dependencies.gradle

[n8fr8]

commit 0393a8f5982623554d4228f226fe6c9956610a6f
Author: syphyr 
Date:   Wed Oct 27 02:43:05 2021 +0200

Fix typo in dependencies.gradle

Fixes: move libs.versions.toml to dependencies.gradle makes it
   easier to work with in Android Studio
---
 dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index e8621f40..74e5364d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -40,7 +40,7 @@ ext {
 androidx_leanback_tab:  
"androidx.leanback:leanback-tab:$versions.androidx_leanback_tab" ,
 androidx_localbroadcast:  
"androidx.localbroadcastmanager:localbroadcastmanager:$versions.androidx_localbroadcast"
 ,
 androidx_palette   :  
"androidx.palette:palette:$versions.androidx_palette" ,
-androidx_recyclerview  :  
"androidx.recyclerview:recyclerview$versions.androidx_recyclerview" ,
+androidx_recyclerview  :  
"androidx.recyclerview:recyclerview:$versions.androidx_recyclerview" ,
 apl_appintro   :  
"com.github.apl-devs:appintro:$versions.apl_appintro" ,
 bclogic_pulsator   :  
"pl.bclogic:pulsator4droid:$versions.bclogic_pulsator" ,
 fastlane_screengrab:  
"tools.fastlane:screengrab:$versions.fastlane_screengrab" ,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge pull request #535 from syphyr/main

[n8fr8]

commit 266ef25416b158a848ef646e0dd7b9d53b80feaa
Merge: 4a8ee89f c5dca23d
Author: Nathan Freitas 
Date:   Wed Nov 3 10:49:14 2021 -0400

Merge pull request #535 from syphyr/main

Fix typo in dependencies.gradle

 app-mini/build.gradle  |  5 +-
 app-tv/build.gradle| 15 +-
 app/build.gradle   |  9 ++--
 dependencies.gradle| 58 +++---
 .../torproject/android/service/OrbotService.java   |  2 +-
 5 files changed, 48 insertions(+), 41 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Cleanup dependency implementations and list

[n8fr8]

commit c5dca23de66a93a8ca7809174191e1778b2efe38
Author: syphyr 
Date:   Tue Nov 2 00:43:15 2021 +0100

Cleanup dependency implementations and list

Fixes: "Implements #509: Use Gradle Version Catalog"

Use same library implentations as before Gradle Version Catalog
was introduced. Some extra implentations were added when Gradle
Version Catalog was introduced and are not needed to build the
project.  Also fix spacing in dependency list.
---
 app-mini/build.gradle |  5 ++---
 app-tv/build.gradle   |  5 ++---
 app/build.gradle  |  9 +++-
 dependencies.gradle   | 58 +--
 4 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/app-mini/build.gradle b/app-mini/build.gradle
index 8b961574..89227cee 100644
--- a/app-mini/build.gradle
+++ b/app-mini/build.gradle
@@ -35,12 +35,11 @@ android {
 project(path: ':intentintegrator'),
 project(':orbotservice'),
 libs.android_material,
+libs.androidx_constraint,
 libs.androidx_coordinator,
-libs.androidx_localbroadcast,
 libs.androidx_palette,
 libs.androidx_recyclerview,
-libs.apl_appintro,
-libs.guardian_jtorctl
+libs.apl_appintro
 )
 androidTestImplementation libs.fastlane_screengrab
 }
diff --git a/app-tv/build.gradle b/app-tv/build.gradle
index f4978231..e5f33882 100644
--- a/app-tv/build.gradle
+++ b/app-tv/build.gradle
@@ -42,16 +42,15 @@ dependencies {
 project(':orbotservice'),
 libs.android_material,
 libs.android_snowfall,
+libs.androidx_constraint,
 libs.androidx_coordinator,
 libs.androidx_leanback_core,
 libs.androidx_leanback_paging,
 libs.androidx_leanback_preferences,
 libs.androidx_leanback_tab,
-libs.androidx_localbroadcast,
 libs.androidx_palette,
 libs.androidx_recyclerview,
-libs.apl_appintro,
-libs.guardian_jtorctl
+libs.apl_appintro
 )
 androidTestImplementation libs.fastlane_screengrab
 }
diff --git a/app/build.gradle b/app/build.gradle
index 93304560..0f5a8b21 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,18 +58,15 @@ android {
 project(':appcore'),
 project(':intentintegrator'),
 project(':orbotservice'),
-libs.apl_appintro,
+libs.android_material,
 libs.android_snowfall,
 libs.android_volley,
-libs.androidx_core,
 libs.androidx_localbroadcast,
-libs.androidx_palette,
-libs.android_material,
+libs.apl_appintro,
 libs.bclogic_pulsator,
-libs.guardian_jtorctl,
 libs.ipt_proxy
 
 )
 androidTestImplementation libs.fastlane_screengrab
 }
-}
\ No newline at end of file
+}
diff --git a/dependencies.gradle b/dependencies.gradle
index 74e5364d..555c4977 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -5,12 +5,12 @@ ext {
 android_snowfall : "1.2.1",
 android_volley   : "1.2.0",
 androidx_appcompat   : "1.3.1",
-androidx_constraint : "2.1.0",
-androidx_coordinator: "1.1.0",
+androidx_constraint  : "2.1.0",
+androidx_coordinator : "1.1.0",
 androidx_core: "1.6.0",
 androidx_leanback: "1.2.0-alpha01",
-androidx_leanback_paging   : "1.1.0-alpha08",
-androidx_leanback_tab  : "1.1.0-beta01",
+androidx_leanback_paging : "1.1.0-alpha08",
+androidx_leanback_tab: "1.1.0-beta01",
 androidx_localbroadcast  : "1.0.0",
 androidx_palette : "1.0.0",
 androidx_recyclerview: "1.2.1",
@@ -26,29 +26,29 @@ ext {
 ]
 
 libs = [
-android_material   :  
"com.google.android.material:material:$versions.android_material",
-android_shell  : 
"com.jaredrummler:android-shell:$versions.android_shell" ,
-android_snowfall   :  
"com.github.jetradarmobile:android-snowfall:$versions.android_snowfall" ,
-android_volley : 
"com.android.volley:volley:$versions.android_volley" ,
-androidx_appcompat :  
"androidx.appcompat:appcompat:$versions.androidx_appcompat" ,
-androidx_constraint   :  
"androidx.constraintlayout:constraintlayout:$versions.androidx_constraint" ,
-androidx_coordinator  :  
"androidx.coordinatorlayout:coordinatorlayout:$versions.androidx_coordinator" ,
- 

[tor-commits] [orbot/master] Correct typo in orbot error message

[n8fr8]

commit ab1c39a74cbbd1f868990b3a1cf887eaef45b340
Author: syphyr 
Date:   Wed Oct 27 19:25:37 2021 +0200

Correct typo in orbot error message
---
 .../src/main/java/org/torproject/android/service/OrbotService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 00ae9fb9..280d26e3 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -487,7 +487,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 
 } catch (Exception e) {
 //what error here
-Log.e(OrbotConstants.TAG, "Error installing setting up Orbot", e);
+Log.e(OrbotConstants.TAG, "Error setting up Orbot", e);
 logNotice("There was an error setting up Orbot");
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Fix missing dependencies for app-tv

[n8fr8]

commit 4c27f85fd8be74befdee157a431e4a2cecc49caf
Author: syphyr 
Date:   Wed Oct 27 03:24:33 2021 +0200

Fix missing dependencies for app-tv

Execution failed for task ':app-tv:processTeeveeReleaseResources'.
> A failure occurred while executing
  
com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask$TaskAction
   > Android resource linking failed
 
ERROR:/src/orbot/app-tv/build/intermediates/packaged_manifests/teeveeRelease/
   x86_64/AndroidManifest.xml:45: AAPT: error: resource 
style/Theme.Leanback
   (aka org.torproject.android.tv:style/Theme.Leanback) not found.
---
 app-tv/build.gradle | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app-tv/build.gradle b/app-tv/build.gradle
index 10017f54..f4978231 100644
--- a/app-tv/build.gradle
+++ b/app-tv/build.gradle
@@ -39,7 +39,19 @@ dependencies {
 implementation(
 project(':appcore'),
 project(':intentintegrator'),
-project(':orbotservice')
+project(':orbotservice'),
+libs.android_material,
+libs.android_snowfall,
+libs.androidx_coordinator,
+libs.androidx_leanback_core,
+libs.androidx_leanback_paging,
+libs.androidx_leanback_preferences,
+libs.androidx_leanback_tab,
+libs.androidx_localbroadcast,
+libs.androidx_palette,
+libs.androidx_recyclerview,
+libs.apl_appintro,
+libs.guardian_jtorctl
 )
 androidTestImplementation libs.fastlane_screengrab
-}
\ No newline at end of file
+}



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update changelog for 16.5.2 beta 1

[n8fr8]

commit 4a8ee89f09de106a67ec25db844e8a39144d8ae7
Author: n8fr8 
Date:   Tue Oct 26 16:36:16 2021 -0400

update changelog for 16.5.2 beta 1
---
 CHANGELOG | 194 ++
 1 file changed, 194 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 965d3f97..e209b446 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,197 @@
+/** 16.5.2-BETA 1 26 Oct 2021 **/
+
+57add48c (HEAD -> master, origin/master, origin/HEAD) move libs.versions.toml 
to dependencies.gradle makes it easier to work with in Android Studio
+9497a5e3 (tag: 16.5.2-BETA-1-tor.0.4.6.7) switch to tor 0.4.6.7
+ece15f2f Merge branch 'master' of github.com:guardianproject/orbot
+0b1e7be2 Merge branch 'no_v2_onions'
+2d1455ef stop warning us about jcenter...we know already!
+d119de00 (no_v2_onions) handle geoip failed loading and other potential NPE
+a783bf60 update library and gradle
+3ad3f1df update library versions
+8c831500 Merge pull request #529 from syphyr/main
+2ee2955e Merge pull request #534 from weblate/weblate-guardianproject-orbot
+a23f02b2 Translated using Weblate (Portuguese (Brazil))
+cb98e7fe (origin/no_v2_onions) Removes V2 Onion Services From Orbot  - Removes 
V2 Hosted Services and Client Cookies  - Removes Assocaited Code in 
OrbotService  - OrbotApp will delete local v2 databases  - Removes XML 
Resources  - Refactored V2 code that V3 used to appropriate V3 Backages
+e815bc07 Merge pull request #527 from guardianproject/fix_523_onionbackup
+2b83f0d9 Add geoip library to libs.versions.toml
+5465fffb (origin/fix_523_onionbackup) Fixes #523 Onion Site Backup Bags
+d3fba523 Merge branch 'fix_519_exit_icon'
+3b81a4e0 (fix_519_exit_icon) Merge branch 'master' into fix_519_exit_icon
+af5f9ef6 Merge branch 'sisbell-509'
+87084b29 (sisbell-509) Merge branch '509' of https://github.com/sisbell/orbot 
into sisbell-509
+384518da Merge pull request #515 from weblate/weblate-guardianproject-orbot
+2085efbb Translated using Weblate (Polish)
+d991a573 Translated using Weblate (German)
+b04d74d6 Translated using Weblate (Hebrew)
+b52082df Translated using Weblate (Finnish)
+f7e024ff Translated using Weblate (Ukrainian)
+eaa9c306 Translated using Weblate (Lithuanian)
+cc3c0cbd Translated using Weblate (Vietnamese)
+1065d695 Translated using Weblate (Romanian)
+52d30704 Translated using Weblate (Italian)
+03152454 (origin/fix_519_exit_icon) Fixes 519 Icon Always Leaves on Exit
+f2ea0b95 orbotservice lint; unused imports
+e625d4c8 local.properties ignored twice
+0a296e87 add tv screenshots to fastlane
+6287db6d Merge branch 'bitmold-vpn_blocklist'
+482696b9 (origin/bitmold-vpn_blocklist, bitmold-vpn_blocklist) only set 
disallowed if "per app" is not being used
+a8565835 Merge branch 'vpn_blocklist' of https://github.com/bitmold/orbot into 
bitmold-vpn_blocklist
+81d25780 ensure tor conn events are set properly by waiting one second longer 
(waiting for a better fix from TorService library on this)
+2697c93c remove debug commandline for pdnsd (doesn't work)
+e8a6e14f remove command line debug commands (don't work, cause failed pdnsd 
startup)
+9759e94f Fixes #474 Remove Briar from Orbot VPN Routing + UI
+8ed64e61 Remove typo
+4727db2d Implements #509: Use Gradle Version Catalog
+822d3582 Merge branch 'bitmold-missing_vpn_icons'
+91f0fc4c (bitmold-missing_vpn_icons) Merge branch 'missing_vpn_icons' of 
https://github.com/bitmold/orbot into bitmold-missing_vpn_icons
+9376a33f Merge branch 'sisbell-505'
+3943b9d9 (sisbell-505) Merge branch '505' of https://github.com/sisbell/orbot 
into sisbell-505
+f3a83d6e remove unsupported string locale
+aa2f224b Merge branch 'sisbell-501'
+c4c099ad (sisbell-501) Merge branch '501' of https://github.com/sisbell/orbot 
into sisbell-501
+9376d450 Merge pull request #497 from weblate/weblate-guardianproject-orbot
+c1fdff65 Package name is saved for torified apps instead of "username". This 
is much more performant than the last commit, but the UI will not immediately 
be updated if the user had older Orbot data saved (No "torification" is 
actually compromised though...)
+d8a44643 Fixes #498, Not performant because pref data isn't migrated
+e6c9d985 Translated using Weblate (Russian)
+31458190 Translated using Weblate (Ukrainian)
+0748373b Translated using Weblate (Chinese (Simplified))
+517661ce Translated using Weblate (Turkish)
+e0d819fb Translated using Weblate (Portuguese (Brazil))
+5909ae70 Translated using Weblate (Icelandic)
+44f59e03 Translated using Weblate (Hebrew)
+b9b4706c Translated using Weblate (Bengali)
+80af9baa Translated using Weblate (Russian)
+2b3794b1 Translated using Weblate (Dutch)
+088a0f47 Translated using Weblate (Romanian)
+83a855b8 Translated using Weblate (Polish)
+fd12e20d Translated using Weblate (Lithuanian)
+c43662a9 Translated using Weblate (Turkish)
+ff8411ab Add in versionCode updates based on ABI
+c75f5305 Removed Log.e from OrbotService onBind (not an error)
+c3f2395d Format error in pdnsd configuration, expected number 

[tor-commits] [orbot/master] update library and gradle

[n8fr8]

commit a783bf60d50537c5f3046399ac1a7fbb06e8bab5
Author: n8fr8 
Date:   Tue Oct 26 09:03:29 2021 -0400

update library and gradle
---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index ecb8ab1f..1e39b78d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all 
sub-projects/modules.
 buildscript {
 ext {
-kotlin_version = '1.5.20'
+kotlin_version = '1.5.31'
 }
 repositories {
 mavenCentral()
@@ -9,7 +9,7 @@ buildscript {
 maven { url 'https://jitpack.io' }
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:7.0.0'
+classpath 'com.android.tools.build:gradle:7.0.3'
 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 }
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Add geoip library to libs.versions.toml

[n8fr8]

commit 2b83f0d93ad51b2b2e2e0606837baa5b4957ca28
Author: syphyr 
Date:   Tue Sep 28 21:19:21 2021 +0200

Add geoip library to libs.versions.toml

Fixes "Implements #509: Use Gradle Version Catalog"
---
 gradle/libs.versions.toml | 4 +++-
 orbotservice/build.gradle | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bcf9ea29..46f00ecb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,6 +18,7 @@ androidx-recyclerview-version = "1.2.1"
 apl-appintro-version = "v4.2.2"
 bclogic-pulsator-version = "1.0.3"
 fastlane-screengrab-version = "1.2.0"
+guardian-geoip-version = "20191217"
 guardian-jsocks-version = "1.0.4"
 guardian-jtorctl-version = "0.4.5.7"
 ipt-proxy-version = "1.0.0"
@@ -45,6 +46,7 @@ androidx-recyclerview = { module = 
"androidx.recyclerview:recyclerview", version
 apl-appintro = { module = "com.github.apl-devs:appintro", version.ref = 
"apl-appintro-version" }
 bclogic-pulsator = { module = "pl.bclogic:pulsator4droid", version.ref = 
"bclogic-pulsator-version" }
 fastlane-screengrab = { module = "tools.fastlane:screengrab", version.ref = 
"fastlane-screengrab-version" }
+guardian-geoip = { module = "info.guardianproject:geoip", version.ref = 
"guardian-geoip-version" }
 guardian-jsocks = { module = "com.gitlab.guardianproject:jsocksandroid", 
version.ref = "guardian-jsocks-version" }
 guardian-jtorctl = { module = "info.guardianproject:jtorctl", version.ref = 
"guardian-jtorctl-version" }
 ipt-proxy = { module = "com.github.tladesignz:IPtProxy", version.ref = 
"ipt-proxy-version" }
@@ -52,4 +54,4 @@ portmapper = { module = 
"com.offbynull.portmapper:portmapper", version.ref = "po
 tor-android = { module = "info.guardianproject:tor-android", version.ref = 
"tor-android-version" }
 
 [bundles]
-leanback= ["androidx-leanback-core", "androidx-leanback-paging", 
"androidx-leanback-preferences", "androidx-leanback-tab"]
\ No newline at end of file
+leanback= ["androidx-leanback-core", "androidx-leanback-paging", 
"androidx-leanback-preferences", "androidx-leanback-tab"]
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index 2f7080c9..798a2c6e 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -45,6 +45,7 @@ dependencies {
 libs.androidx.localbroadcast,
 libs.ipt.proxy,
 libs.guardian.jsocks,
+libs.guardian.geoip,
 libs.portmapper,
 libs.tor.android
 )



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] switch to tor 0.4.6.7

[n8fr8]

commit 9497a5e3b9bb2e56771c4a126fd28e89378826dd
Author: n8fr8 
Date:   Tue Oct 26 15:16:57 2021 -0400

switch to tor 0.4.6.7
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a61c82d2..25ffeb4e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ guardian-jsocks-version = "1.0.4"
 guardian-jtorctl-version = "0.4.5.7"
 ipt-proxy-version = "1.0.0"
 portmapper-version = "2.0.5"
-tor-android-version = "0.4.6.10"
+tor-android-version = "0.4.6.7"
 
 [libraries]
 android-material = { module = "com.google.android.material:material", 
version.ref = "android-material-version" }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] move libs.versions.toml to dependencies.gradle

[n8fr8]

commit 57add48cd904afe94363219887cd142bb5cf6696
Author: n8fr8 
Date:   Tue Oct 26 16:11:12 2021 -0400

move libs.versions.toml to dependencies.gradle
makes it easier to work with in Android Studio
---
 app-mini/build.gradle  | 17 ---
 app-tv/build.gradle| 16 ++
 app/build.gradle   | 25 +-
 .../android/ui/onboarding/MoatActivity.java|  2 +-
 appcore/build.gradle   |  3 +-
 build.gradle   |  1 +
 commons.gradle |  1 +
 dependencies.gradle| 54 
 gradle/libs.versions.toml  | 57 --
 intentintegrator/build.gradle  |  2 +-
 orbotservice/build.gradle  | 17 ---
 .../torproject/android/service/OrbotService.java   |  2 +-
 settings.gradle|  3 +-
 13 files changed, 98 insertions(+), 102 deletions(-)

diff --git a/app-mini/build.gradle b/app-mini/build.gradle
index e861fb41..8b961574 100644
--- a/app-mini/build.gradle
+++ b/app-mini/build.gradle
@@ -1,4 +1,5 @@
 apply from: "../commons-device.gradle"
+apply from : '../dependencies.gradle'
 
 android {
 defaultConfig {
@@ -33,14 +34,14 @@ android {
 project(path: ':appcore'),
 project(path: ':intentintegrator'),
 project(':orbotservice'),
-libs.android.material,
-libs.androidx.coordinator.layout,
-libs.androidx.localbroadcast,
-libs.androidx.palette,
-libs.androidx.recyclerview,
-libs.apl.appintro,
-libs.guardian.jtorctl
+libs.android_material,
+libs.androidx_coordinator,
+libs.androidx_localbroadcast,
+libs.androidx_palette,
+libs.androidx_recyclerview,
+libs.apl_appintro,
+libs.guardian_jtorctl
 )
-androidTestImplementation libs.fastlane.screengrab
+androidTestImplementation libs.fastlane_screengrab
 }
 }
diff --git a/app-tv/build.gradle b/app-tv/build.gradle
index 259ae0e5..10017f54 100644
--- a/app-tv/build.gradle
+++ b/app-tv/build.gradle
@@ -1,10 +1,11 @@
 apply from: "../commons-limited-device.gradle"
+apply from : '../dependencies.gradle'
 
 android {
 defaultConfig {
 applicationId "org.torproject.android.tv"
 minSdkVersion 23 
-targetSdkVersion 29
+targetSdkVersion 30
 }
 
 aaptOptions {
@@ -38,16 +39,7 @@ dependencies {
 implementation(
 project(':appcore'),
 project(':intentintegrator'),
-project(':orbotservice'),
-libs.android.material,
-libs.android.snowfall,
-libs.androidx.coordinator.layout,
-libs.androidx.localbroadcast,
-libs.androidx.palette,
-libs.androidx.recyclerview,
-libs.apl.appintro,
-libs.guardian.jtorctl,
-libs.bundles.leanback
+project(':orbotservice')
 )
-androidTestImplementation libs.fastlane.screengrab
+androidTestImplementation libs.fastlane_screengrab
 }
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index c57707c8..93304560 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 apply from: "../commons-device.gradle"
+apply from : '../dependencies.gradle'
 
 /* gets the version name from the latest Git tag, stripping the leading v off 
*/
 def getVersionName = { ->
@@ -39,7 +40,7 @@ android {
 minSdkVersion 16
 applicationId 'org.torproject.android'
 targetSdkVersion 29
-versionCode 1651100210
+versionCode 1652100110
 
 versionName getVersionName()
 archivesBaseName = "Orbot-$versionName"
@@ -57,18 +58,18 @@ android {
 project(':appcore'),
 project(':intentintegrator'),
 project(':orbotservice'),
-libs.apl.appintro,
-libs.android.snowfall,
-libs.android.volley,
-libs.androidx.core,
-libs.androidx.localbroadcast,
-libs.androidx.palette,
-libs.android.material,
-libs.bclogic.pulsator,
-libs.guardian.jtorctl,
-libs.ipt.proxy
+libs.apl_appintro,
+libs.android_snowfall,
+libs.android_volley,
+libs.androidx_core,
+libs.androidx_localbroadcast,
+libs.androidx_palette,
+libs.android_material,
+libs.bclogic_pulsator,
+libs.guardian_jtorctl,
+

[tor-commits] [orbot/master] Merge branch 'master' of github.com:guardianproject/orbot

[n8fr8]

commit ece15f2f9e249ec4ebe9963491ba96990c9043df
Merge: 0b1e7be2 8c831500
Author: n8fr8 
Date:   Tue Oct 26 09:04:17 2021 -0400

Merge branch 'master' of github.com:guardianproject/orbot

 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 gradle/libs.versions.toml  | 2 ++
 orbotservice/build.gradle  | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge pull request #529 from syphyr/main

[n8fr8]

commit 8c8315008b3a569039845ea7accbfc9130a5d931
Merge: 2ee2955e 2b83f0d9
Author: Nathan Freitas 
Date:   Tue Oct 19 14:10:53 2021 -0400

Merge pull request #529 from syphyr/main

Add geoip library to libs.versions.toml

 gradle/libs.versions.toml | 4 +++-
 orbotservice/build.gradle | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge branch 'no_v2_onions'

[n8fr8]

commit 0b1e7be203f30c5f3d99abfb018f34b99873d80a
Merge: 2d1455ef d119de00
Author: n8fr8 
Date:   Tue Oct 26 09:04:06 2021 -0400

Merge branch 'no_v2_onions'

 app-mini/src/main/res/values-ar/strings.xml|  13 +-
 app-mini/src/main/res/values-ay/strings.xml|  13 +-
 app-mini/src/main/res/values-az/strings.xml|   3 +-
 app-mini/src/main/res/values-be/strings.xml|  13 +-
 app-mini/src/main/res/values-bg/strings.xml|   6 +-
 app-mini/src/main/res/values-ca/strings.xml|  13 +-
 app-mini/src/main/res/values-cs-rCZ/strings.xml|   3 +-
 app-mini/src/main/res/values-cs/strings.xml|   3 +-
 app-mini/src/main/res/values-cy/strings.xml|   3 +-
 app-mini/src/main/res/values-da/strings.xml|   6 +-
 app-mini/src/main/res/values-de/strings.xml|  13 +-
 app-mini/src/main/res/values-el/strings.xml|  13 +-
 app-mini/src/main/res/values-eo/strings.xml|   3 +-
 app-mini/src/main/res/values-es/strings.xml|  13 +-
 app-mini/src/main/res/values-et/strings.xml|   3 +-
 app-mini/src/main/res/values-eu/strings.xml|  13 +-
 app-mini/src/main/res/values-fa/strings.xml|  13 +-
 app-mini/src/main/res/values-fi/strings.xml|   6 +-
 app-mini/src/main/res/values-fr-rFR/strings.xml|   3 +-
 app-mini/src/main/res/values-fr/strings.xml|  13 +-
 app-mini/src/main/res/values-gl/strings.xml|  13 +-
 app-mini/src/main/res/values-hi/strings.xml|  13 +-
 app-mini/src/main/res/values-hr/strings.xml|   3 +-
 app-mini/src/main/res/values-hu/strings.xml|  13 +-
 app-mini/src/main/res/values-in/strings.xml|   3 +-
 app-mini/src/main/res/values-is/strings.xml|  13 +-
 app-mini/src/main/res/values-it/strings.xml|  13 +-
 app-mini/src/main/res/values-iw/strings.xml|   3 +-
 app-mini/src/main/res/values-ja/strings.xml|  13 +-
 app-mini/src/main/res/values-ko/strings.xml|   3 +-
 app-mini/src/main/res/values-lv/strings.xml|   6 +-
 app-mini/src/main/res/values-mk/strings.xml|  13 +-
 app-mini/src/main/res/values-ms-rMY/strings.xml|   6 +-
 app-mini/src/main/res/values-ms/strings.xml|   3 +-
 app-mini/src/main/res/values-my/strings.xml|   3 +-
 app-mini/src/main/res/values-nb/strings.xml|  13 +-
 app-mini/src/main/res/values-nl/strings.xml|  13 +-
 app-mini/src/main/res/values-pl/strings.xml|   6 +-
 app-mini/src/main/res/values-pt-rBR/strings.xml|   8 +-
 app-mini/src/main/res/values-pt/strings.xml|   6 +-
 app-mini/src/main/res/values-ro/strings.xml|   6 +-
 app-mini/src/main/res/values-ru/strings.xml|  13 +-
 app-mini/src/main/res/values-si-rLK/strings.xml|   6 +-
 app-mini/src/main/res/values-sk/strings.xml|   3 +-
 app-mini/src/main/res/values-sr/strings.xml|  13 +-
 app-mini/src/main/res/values-sv/strings.xml|  13 +-
 app-mini/src/main/res/values-ta/strings.xml|   6 +-
 app-mini/src/main/res/values-th/strings.xml|  13 +-
 app-mini/src/main/res/values-tl/strings.xml|   3 +-
 app-mini/src/main/res/values-tr/strings.xml|  13 +-
 app-mini/src/main/res/values-uk/strings.xml|  13 +-
 app-mini/src/main/res/values-vi/strings.xml|   3 +-
 app-mini/src/main/res/values-zh-rCN/strings.xml|   3 +-
 app-mini/src/main/res/values-zh-rTW/strings.xml|  13 +-
 app-mini/src/main/res/values/strings.xml   |  11 -
 app-tv/src/main/res/values-ar/strings.xml  |  13 +-
 app-tv/src/main/res/values-ay/strings.xml  |  13 +-
 app-tv/src/main/res/values-az/strings.xml  |   3 +-
 app-tv/src/main/res/values-be/strings.xml  |  13 +-
 app-tv/src/main/res/values-bg/strings.xml  |   6 +-
 app-tv/src/main/res/values-ca/strings.xml  |  13 +-
 app-tv/src/main/res/values-cs-rCZ/strings.xml  |   3 +-
 app-tv/src/main/res/values-cs/strings.xml  |   3 +-
 app-tv/src/main/res/values-cy/strings.xml  |   3 +-
 app-tv/src/main/res/values-da/strings.xml  |   6 +-
 app-tv/src/main/res/values-de/strings.xml  |  13 +-
 app-tv/src/main/res/values-el/strings.xml  |  13 +-
 app-tv/src/main/res/values-eo/strings.xml  |   3 +-
 app-tv/src/main/res/values-es/strings.xml  |  13 +-
 app-tv/src/main/res/values-et/strings.xml  |   3 +-
 app-tv/src/main/res/values-eu/strings.xml  |  13 +-
 app-tv/src/main/res/values-fa/strings.xml  |  13 +-
 app-tv/src/main/res/values-fi/strings.xml  |   6 +-
 app-tv/src/main/res/values-fr-rFR/strings.xml  |   3 +-
 app-tv/src/main/res/values-fr/strings.xml  |  13 +-
 app-tv/src/main/res/values-gl/strings.xml  |  13 +-
 app-tv/src/main/res/values-hi/strings.xml  |  13 +-
 app-tv/src/main/res/values-hr/strings.xml  |   3 +-
 app-tv/src/main/res/values-hu/strings.xml  |  13 +-
 

[tor-commits] [orbot/master] stop warning us about jcenter...we know already!

[n8fr8]

commit 2d1455ef7ad66d1ef69e9c873550bc515885eed0
Author: n8fr8 
Date:   Tue Oct 26 09:03:52 2021 -0400

stop warning us about jcenter...we know already!
---
 commons-device.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/commons-device.gradle b/commons-device.gradle
index 0fd02b1a..f182a18b 100644
--- a/commons-device.gradle
+++ b/commons-device.gradle
@@ -59,6 +59,7 @@ android {
 }
 
 repositories {
+//noinspection JcenterRepositoryObsolete
 jcenter {
 content {
 includeGroup('com.jraska')



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge pull request #527 from guardianproject/fix_523_onionbackup

[n8fr8]

commit e815bc07864f8ee968dfec3a8ce89257b76d8d65
Merge: d3fba523 5465fffb
Author: Nathan Freitas 
Date:   Tue Oct 12 09:04:09 2021 -0400

Merge pull request #527 from guardianproject/fix_523_onionbackup

Fixes #523 Onion Site Backup Bugs

 .../ui/hiddenservices/HiddenServicesActivity.java  |  4 +++-
 .../ui/hiddenservices/backup/BackupUtils.java  | 28 +++---
 .../ui/hiddenservices/dialogs/HSActionsDialog.java |  3 ++-
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |  2 +-
 .../providers/HSContentProvider.java   |  4 +++-
 .../OnionServiceActionsDialogFragment.java |  5 +++-
 .../ui/v3onionservice/OnionServiceActivity.java|  3 ++-
 .../OnionServiceContentProvider.java   |  5 ++--
 .../OnionServiceDeleteDialogFragment.java  |  2 +-
 9 files changed, 33 insertions(+), 23 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Portuguese (Brazil))

[n8fr8]

commit a23f02b23801475ff22de2f93af52e256eb56820
Author: Wellington Terumi Uemura 
Date:   Tue Oct 19 06:41:56 2021 +0200

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (222 of 222 strings)

Co-authored-by: Wellington Terumi Uemura 
Translate-URL: 
https://hosted.weblate.org/projects/guardianproject/orbot/pt_BR/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml 
b/app/src/main/res/values-pt-rBR/strings.xml
index bd62525f..8a1d5f4b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -6,7 +6,7 @@
 Conectado à rede Tor
 O Orbot está desativado
 O TorService está desligando
-Configurações
+Definições
 Log
 Iniciar
 Parar



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge pull request #534 from weblate/weblate-guardianproject-orbot

[n8fr8]

commit 2ee2955e5a20f8a7a1fb2acec065c1fb040d082b
Merge: e815bc07 a23f02b2
Author: Nathan Freitas 
Date:   Tue Oct 19 14:10:35 2021 -0400

Merge pull request #534 from weblate/weblate-guardianproject-orbot

Translations update from Weblate

 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update library versions

[n8fr8]

commit 3ad3f1dfe2f9b789cfc8ef682295f545fb402f2a
Author: n8fr8 
Date:   Tue Oct 26 08:49:46 2021 -0400

update library versions
---
 build.gradle  | 4 ++--
 gradle/libs.versions.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index ecb8ab1f..1e39b78d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all 
sub-projects/modules.
 buildscript {
 ext {
-kotlin_version = '1.5.20'
+kotlin_version = '1.5.31'
 }
 repositories {
 mavenCentral()
@@ -9,7 +9,7 @@ buildscript {
 maven { url 'https://jitpack.io' }
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:7.0.0'
+classpath 'com.android.tools.build:gradle:7.0.3'
 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bcf9ea29..a48d82b0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ guardian-jsocks-version = "1.0.4"
 guardian-jtorctl-version = "0.4.5.7"
 ipt-proxy-version = "1.0.0"
 portmapper-version = "2.0.5"
-tor-android-version = "0.4.5.9"
+tor-android-version = "0.4.6.10"
 
 [libraries]
 android-material = { module = "com.google.android.material:material", 
version.ref = "android-material-version" }
@@ -52,4 +52,4 @@ portmapper = { module = 
"com.offbynull.portmapper:portmapper", version.ref = "po
 tor-android = { module = "info.guardianproject:tor-android", version.ref = 
"tor-android-version" }
 
 [bundles]
-leanback= ["androidx-leanback-core", "androidx-leanback-paging", 
"androidx-leanback-preferences", "androidx-leanback-tab"]
\ No newline at end of file
+leanback= ["androidx-leanback-core", "androidx-leanback-paging", 
"androidx-leanback-preferences", "androidx-leanback-tab"]



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] handle geoip failed loading and other potential NPE

[n8fr8]

commit d119de00600efb0e235246abf03979c7e7371eb5
Author: n8fr8 
Date:   Tue Oct 26 09:03:36 2021 -0400

handle geoip failed loading and other potential NPE
---
 .../org/torproject/android/service/OrbotService.java| 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index e90be3f3..e02c6f1d 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -469,8 +469,15 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 if (Build.VERSION.SDK_INT >= 26)
 createNotificationChannel();
 
-CustomTorResourceInstaller installer = new 
CustomTorResourceInstaller(this, appBinHome);
-installer.installGeoIP();
+try {
+CustomTorResourceInstaller installer = new 
CustomTorResourceInstaller(this, appBinHome);
+installer.installGeoIP();
+}
+catch (IOException io)
+{
+Log.e(OrbotConstants.TAG, "Error installing geoip files", io);
+logNotice("There was an error installing geoip files");
+}
 
 pluggableTransportInstall();
 
@@ -480,8 +487,8 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 
 } catch (Exception e) {
 //what error here
-Log.e(OrbotConstants.TAG, "Error installing Orbot binaries", e);
-logNotice("There was an error installing Orbot binaries");
+Log.e(OrbotConstants.TAG, "Error installing setting up Orbot", e);
+logNotice("There was an error setting up Orbot");
 }
 
 Log.i("OrbotService", "onCreate end");
@@ -960,7 +967,7 @@ public class OrbotService extends VpnService implements 
TorServiceConstants, Orb
 
 LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
 
-if (Prefs.useVpn())
+if (Prefs.useVpn() && mVpnManager != null)
 mVpnManager.handleIntent(new Builder(), intent);
 
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge branch '509' of https://github.com/sisbell/orbot into sisbell-509

[n8fr8]

commit 87084b29770390b57b717ba4ce4112d3b8c1349d
Merge: 384518da 8ed64e61
Author: n8fr8 
Date:   Tue Sep 28 08:50:00 2021 -0400

Merge branch '509' of https://github.com/sisbell/orbot into sisbell-509

 app-mini/build.gradle  | 30 ++--
 app-tv/build.gradle| 27 +--
 app/build.gradle   | 34 +++--
 appcore/build.gradle   | 10 +---
 .../android/core/ExampleInstrumentedTest.kt| 24 --
 .../org/torproject/android/core/ExampleUnitTest.kt | 17 ---
 build.gradle   |  1 -
 commons-device.gradle  |  1 -
 gradle/libs.versions.toml  | 55 ++
 gradle/wrapper/gradle-wrapper.properties   |  4 +-
 intentintegrator/build.gradle  |  2 +-
 orbotservice/build.gradle  | 19 
 settings.gradle|  9 
 13 files changed, 123 insertions(+), 110 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge branch 'master' into fix_519_exit_icon

[n8fr8]

commit 3b81a4e05301a27634d7a5c18e4460358d2aabe7
Merge: 03152454 af5f9ef6
Author: n8fr8 
Date:   Tue Sep 28 08:59:27 2021 -0400

Merge branch 'master' into fix_519_exit_icon

 app-mini/build.gradle  | 30 
 app-tv/build.gradle| 27 
 app/build.gradle   | 34 +
 app/src/main/res/values-de/strings.xml |  2 +
 app/src/main/res/values-fi/strings.xml | 81 +-
 app/src/main/res/values-it/strings.xml | 44 +++-
 app/src/main/res/values-iw/strings.xml |  3 +
 app/src/main/res/values-lt-rLT/strings.xml | 50 ++---
 app/src/main/res/values-pl/strings.xml |  4 ++
 app/src/main/res/values-ro-rRO/strings.xml |  7 +-
 app/src/main/res/values-uk/strings.xml |  2 +-
 app/src/main/res/values-vi/strings.xml |  3 +-
 appcore/build.gradle   | 10 +--
 .../android/core/ExampleInstrumentedTest.kt| 24 ---
 .../org/torproject/android/core/ExampleUnitTest.kt | 17 -
 build.gradle   |  1 -
 commons-device.gradle  |  1 -
 .../metadata/android/fi-FI/full_description.txt| 30 
 .../metadata/android/fi-FI/short_description.txt   |  2 +-
 fastlane/metadata/android/fi-FI/title.txt  |  2 +-
 .../metadata/android/it-IT/changelogs/16123000.txt |  2 +
 .../metadata/android/it-IT/short_description.txt   |  2 +-
 .../metadata/android/lt/changelogs/1550.txt|  4 +-
 .../metadata/android/lt/changelogs/1551.txt|  4 +-
 .../metadata/android/lt/changelogs/1641200200.txt  |  2 +-
 fastlane/metadata/android/lt/full_description.txt  |  6 +-
 fastlane/metadata/android/ro/short_description.txt |  2 +-
 fastlane/metadata/android/ro/title.txt |  2 +-
 gradle/libs.versions.toml  | 55 +++
 gradle/wrapper/gradle-wrapper.properties   |  4 +-
 intentintegrator/build.gradle  |  2 +-
 orbotservice/build.gradle  | 19 +++--
 settings.gradle|  9 +++
 33 files changed, 310 insertions(+), 177 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Merge branch 'fix_519_exit_icon'

[n8fr8]

commit d3fba5232ef501f459560ee8831ef8547a8df010
Merge: af5f9ef6 3b81a4e0
Author: n8fr8 
Date:   Tue Sep 28 08:59:36 2021 -0400

Merge branch 'fix_519_exit_icon'

 .../src/main/java/org/torproject/android/service/OrbotService.java | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Fixes #523 Onion Site Backup Bags

[n8fr8]

commit 5465fffbe8061f890342241e0fbbabb55e883e2d
Author: bim 
Date:   Thu Sep 23 21:53:42 2021 -0400

Fixes #523 Onion Site Backup Bags

This bug was introdued when a previous bug fix pertaining to Onion service 
storage in Orbot was addressed.
The old bug made it such that multiple onion services could be hosted that 
pointed to the same local port on the device.
This previous bug fix broke the backup logic for v2 and v3 onion services, 
which is fixed here.
---
 .../ui/hiddenservices/HiddenServicesActivity.java  |  4 +++-
 .../ui/hiddenservices/backup/BackupUtils.java  | 28 +++---
 .../ui/hiddenservices/dialogs/HSActionsDialog.java |  3 ++-
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |  2 +-
 .../providers/HSContentProvider.java   |  4 +++-
 .../OnionServiceActionsDialogFragment.java |  5 +++-
 .../ui/v3onionservice/OnionServiceActivity.java|  3 ++-
 .../OnionServiceContentProvider.java   |  5 ++--
 .../OnionServiceDeleteDialogFragment.java  |  2 +-
 9 files changed, 33 insertions(+), 23 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
 
b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
index 7436eb91..147c4e7e 100644
--- 
a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
+++ 
b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
@@ -39,7 +39,8 @@ public class HiddenServicesActivity extends AppCompatActivity 
{
 BUNDLE_KEY_PORT = "port",
 BUNDLE_KEY_ONION = "onion",
 BUNDLE_KEY_AUTH_COOKIE = "auth_cookie",
-BUNDLE_KEY_AUTH_COOKIE_VALUE = "auth_cookie_value";
+BUNDLE_KEY_AUTH_COOKIE_VALUE = "auth_cookie_value",
+BUNDLE_KEY_PATH = "path";
 private static final int REQUEST_CODE_READ_ZIP_BACKUP = 125;
 private static final String BUNDLE_KEY_SHOW_USER_SERVICES = 
"show_user_services";
 private ContentResolver mResolver;
@@ -83,6 +84,7 @@ public class HiddenServicesActivity extends AppCompatActivity 
{
 arguments.putString(BUNDLE_KEY_ONION, 
item.getString(item.getColumnIndex(HSContentProvider.HiddenService.DOMAIN)));
 arguments.putInt(BUNDLE_KEY_AUTH_COOKIE, 
item.getInt(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE)));
 arguments.putString(BUNDLE_KEY_AUTH_COOKIE_VALUE, 
item.getString(item.getColumnIndex(HSContentProvider.HiddenService.AUTH_COOKIE_VALUE)));
+arguments.putString(BUNDLE_KEY_PATH, 
item.getString(item.getColumnIndex(HSContentProvider.HiddenService.PATH)));
 
 HSActionsDialog dialog = new HSActionsDialog();
 dialog.setArguments(arguments);
diff --git 
a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
 
b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
index d6cb091c..64ca1e8d 100644
--- 
a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
+++ 
b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
@@ -40,8 +40,8 @@ public class BackupUtils {
 mResolver = mContext.getContentResolver();
 }
 
-public String createV3ZipBackup(String port, Uri zipFile) {
-String[] files = createFilesForZippingV3(port);
+public String createV3ZipBackup(String port, String relativePath, Uri 
zipFile) {
+String[] files = createFilesForZippingV3(relativePath);
 ZipUtilities zip = new ZipUtilities(files, zipFile, mResolver);
 if (!zip.zip()) return null;
 return zipFile.getPath();
@@ -61,8 +61,8 @@ public class BackupUtils {
 return backupFile.getPath();
 }
 
-public String createV2ZipBackup(int port, Uri zipFile) {
-String[] files = createFilesForZippingV2(port);
+public String createV2ZipBackup(int port, String relativePath, Uri 
zipFile) {
+String[] files = createFilesForZippingV2(relativePath);
 ZipUtilities zip = new ZipUtilities(files, zipFile, mResolver);
 
 if (!zip.zip())
@@ -72,15 +72,15 @@ public class BackupUtils {
 }
 
 // todo this doesn't export data for onions that orbot hosts which have 
authentication (not supported yet...)
-private String[] createFilesForZippingV3(String port) {
-final String v3BasePath = getV3BasePath() + "/v3" + port + "/";
+private String[] createFilesForZippingV3(String relativePath) {
+final String v3BasePath = getV3BasePath() + "/" + relativePath + "/";
 final String hostnamePath = v3BasePath + "hostname",
 configFilePath = v3BasePath + configFileName,
 privKeyPath = v3BasePath + "hs_ed25519_secret_key",
 pubKeyPath = v3BasePath + "hs_ed25519_public_key";
 
 Cursor portData = 

[tor-commits] [orbot/master] Merge branch 'sisbell-509'

[n8fr8]

commit af5f9ef683ff66e3eb626ce5b4f69445cbe86423
Merge: 384518da 87084b29
Author: n8fr8 
Date:   Tue Sep 28 08:56:59 2021 -0400

Merge branch 'sisbell-509'

 app-mini/build.gradle  | 30 ++--
 app-tv/build.gradle| 27 +--
 app/build.gradle   | 34 +++--
 appcore/build.gradle   | 10 +---
 .../android/core/ExampleInstrumentedTest.kt| 24 --
 .../org/torproject/android/core/ExampleUnitTest.kt | 17 ---
 build.gradle   |  1 -
 commons-device.gradle  |  1 -
 gradle/libs.versions.toml  | 55 ++
 gradle/wrapper/gradle-wrapper.properties   |  4 +-
 intentintegrator/build.gradle  |  2 +-
 orbotservice/build.gradle  | 19 
 settings.gradle|  9 
 13 files changed, 123 insertions(+), 110 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Ukrainian)

[n8fr8]

commit f7e024ff256a5df89aa148a94268b7e608bd4e81
Author: Tymofii Lytvynenko 
Date:   Mon Sep 20 14:35:30 2021 +0200

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (222 of 222 strings)

Co-authored-by: Tymofii Lytvynenko 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/uk/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-uk/strings.xml 
b/app/src/main/res/values-uk/strings.xml
index 94b75f1f..fa5ad41b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -82,7 +82,7 @@
 Порти 
доступні із обмежуваного брандмауера
 Введіть порти
 Увімкнути
 вивід журналу зневадження (потрібно 
використовувати adb або aLogCat для 
перегляду)
-Домашня сторінка(и) 
проекту: 
+Домашня сторінка(и) 
проєкту:
 https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
 Програми сторонніх 
розробників: 
 Tor: https://www.torproject.org



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Polish)

[n8fr8]

commit 2085efbb81c0c39d86d43e21f7ada57bfca0012a
Author: gnu-ewm 
Date:   Mon Sep 20 14:35:32 2021 +0200

Translated using Weblate (Polish)

Currently translated at 78.8% (175 of 222 strings)

Co-authored-by: gnu-ewm 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/pl/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-pl/strings.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml 
b/app/src/main/res/values-pl/strings.xml
index a6f199e0..d41d70ae 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -185,4 +185,8 @@
 Zawsze włącza 
wypełnienie połączenia, aby chronić się przed niektórymi formami analizy 
ruchu. Domyślnie: auto
 SOCKS: - HTTP: -
 Zezwalaj urzą
dzeniom w tej samej sieci Wi-Fi, podłączonym do twojego hotspotu Wi-Fi i 
innym, którzy mogą połączyć się z twoim adresem IP, na dostęp do 
Tor
+MiB
+KiB
+Odmów
+Zezwól
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Vietnamese)

[n8fr8]

commit cc3c0cbd3dd3c227fa10f8ca23e5f97d3736aba8
Author: bruh 
Date:   Mon Sep 20 14:35:30 2021 +0200

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (222 of 222 strings)

Co-authored-by: bruh 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/vi/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-vi/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-vi/strings.xml 
b/app/src/main/res/values-vi/strings.xml
index e82312e6..73d36ced 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -222,11 +222,12 @@
 Yêu cầu cầu nối
 Giải CAPTCHA để yêu cầu 
cầu nối.
 Làm mới CAPTCHA
-Nếu
 mạng di động của bạn chặn Tor một cách chủ động, bạn có 
thể sử dụng một \'Máy chủ cầu nối\' làm một cách thay thế 
để vào. CHỌN một trong số các tuỳ chọn để thiết lập và 
thử nghiệm…
+Nếu
 mạng di động của bạn chặn Tor một cách chủ động, bạn có 
thể sử dụng một \'Máy chủ cầu nối\' làm một cách thay thế 
để vào. Chọn một trong số các tuỳ chọn để thiết lập và 
thử nghiệm…
 Dịch vụ Onion
 Toàn cầu (Tự động)
 Chế độ VPN
 Yêu cầu cầu nối qua 
Email
 Chỉ khi thiết bị được 
cắm điện và có wifi
 Giới hạn Proxy 
Snowflake
+CHẾ ĐỘ PROXY SNOWFLAKE ĐÃ 
BẬT
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Hebrew)

[n8fr8]

commit b04d74d6636140e4d5cf5111f700d3dce355b8f1
Author: Yaron Shahrabani 
Date:   Mon Sep 20 14:35:31 2021 +0200

Translated using Weblate (Hebrew)

Currently translated at 42.7% (95 of 222 strings)

Translated using Weblate (Hebrew)

Currently translated at 41.8% (93 of 222 strings)

Co-authored-by: Yaron Shahrabani 
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/he/
Translation: Guardian Project/Orbot
---
 app/src/main/res/values-iw/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-iw/strings.xml 
b/app/src/main/res/values-iw/strings.xml
index 6ae4c4fb..609fc7f8 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -100,4 +100,7 @@
 שירות Tor נכבה
 טביעות 
אצבע, כינויים, מדינות וכתובות עבור נקודת 
הגישור האחרונה
 טביעות 
אצבע, כינויים, מדינות וכתובות להחרגה
+פתחות נ
גישות מאחורי חומת אש מגבילה
+OpenSSL: http://www.openssl.org
+Obfs4proxy: 
https://github.com/Yawning/obfs4
 
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] Translated using Weblate (Finnish)

[n8fr8]

commit b52082df7d046d186a618b57dc691e7bef2ca2e3
Author: Kaantaja 
Date:   Mon Sep 20 14:35:31 2021 +0200

Translated using Weblate (Finnish)

Currently translated at 20.0% (4 of 20 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (222 of 222 strings)

Co-authored-by: Kaantaja 
Translate-URL: 
https://hosted.weblate.org/projects/guardianproject/orbot-metadata/fi/
Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/fi/
Translation: Guardian Project/Orbot
Translation: Guardian Project/Orbot metadata
---
 app/src/main/res/values-fi/strings.xml | 81 +-
 .../metadata/android/fi-FI/full_description.txt| 30 
 .../metadata/android/fi-FI/short_description.txt   |  2 +-
 fastlane/metadata/android/fi-FI/title.txt  |  2 +-
 4 files changed, 92 insertions(+), 23 deletions(-)

diff --git a/app/src/main/res/values-fi/strings.xml 
b/app/src/main/res/values-fi/strings.xml
index 24b991f8..606da9bb 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -124,14 +124,14 @@
 Käynnistä 
Orbot uudelleen ottaaksesi muutokset käyttöön
 Poista käytöstä
 Ota käyttöön
-Orbot on avoimen lähdekoodin sovellus, 
joka sisältää Tor, Obfs4Proxy, BadVPN, Tun2Socks ja LibEvent. Se tarjoaa 
paikallisen HTTP-välityspalvelimen (8118) ja SOCKS-välityspalvelimen (9050) 
Tor-verkkoon. Orbotilla on myös ominaisuus, rootattulla laitteella, 
lähettää kaiken Internet-liikenteen Torin kautta.
+Orbot on avoimen lähdekoodin sovellus, 
joka sisältää seuraavat: Tor, Obfs4Proxy, BadVPN, Tun2Socks ja LibEvent. 
Orbot tarjoaa paikallisen HTTP-välityspalvelimen (8118) ja 
SOCKS-välityspalvelimen (9050) Tor-verkkoon. Orbotilla on myös ominaisuus, 
rootatulla laitteella, lähettää kaikki internet-liikenne Torin 
kautta.
 Obfs4proxy: 
https://github.com/Yawning/obfs4
 OpenSSL: http://www.openssl.org
-Sovellus haluaa avata 
sipulipalvelimen portin %1$d Tor-verkkoon. Tämä on turvallista, jos luotat 
sovellukseen.
+Sovellus haluaa avata 
sipulipalvelimen portin %1$s Tor-verkkoon. Tämä on turvallista, jos luotat 
sovellukseen.
 Tori HTTP
 Portti, jossa Tor tarjoaa 
HTTP-välityspalvelimen (oletus: 8118 tai 0 poistaa käytöstä)
 HTTP-portin määritys
-Jos
 mobiiliverkkosi estää Torin aktiivisesti, voit käyttää Bridge Serveriä 
vaihtoehtoisena tienä. VALITSE yksi vaihtoehdoista määrittää ja testata 
…
+Jos
 mobiiliverkkosi estää Torin aktiivisesti, voit käyttää siltapalvelinta 
vaihtoehtoisena tienä. Valitse yksi vaihtoehdoista määrittääksesi ja 
kokeillaksesi…
 VPN-tila
 Globaali (automaattinen)
 Paikallinen portti
@@ -155,4 +155,79 @@
 Salli
 MiB
 KiB
+Etsi selaimesta %s ja napauta Hanki siltoja 
 Anna minulle siltoja!
+Käytä pienempiä 
pehmustealgoritmeja vähentääksesi dataa ja virrankulutusta
+Vähennetty kiertotien 
pehmustaminen
+Salli kiertotien pehmustaminen 
suojautuaksesi eräiltä verkkoliikenneanalyyseilta
+Kiertotien pehmustaminen
+Sulkee 
välittäjäyhteydet nopeammin ja lähettää vähemmän pehmustepaketteja 
vähentääkseen dataa ja virrankäyttöä
+Vähennetty yhteyden 
pehmustaminen
+Sallii aina yhteyden 
pehmustamisen suojatakseen verkkoliikenneanalyyseiltä. Oletus: 
automaattinen
+Yhteyden pehmustaminen
+Varmuuskopioi tiedostonimi…
+Varmuuskopioi asiakasohjelman 
tunnistautumisavain
+x25519 Yksityinen avain Base 32:ssa
+SNOWFLAKE-VÄLITYSPALVELINTILA 
SALLITTU
+Vain, kun laite on kytkettynä ja 
wifi-yhteydessä
+Snowflake-välityspalvelimen 
rajoitukset
+Salli muiden Tor-käyttäjien 
yhdistää Toriin laitteesi kautta
+Käytä 
Snowflake-välityspalvelinta
+Yhdistä toisten Tor-vertaisten kautta 
(kokeellinen)
+Liitä sillat
+Käytä muokattuja siltoja
+Säädä muokattuja 
siltoja
+Muokatut sillat
+Pyydä siltoja sivulta 
torproject.org
+Syötä kuvassa näkyvät 
merkit
+Captcha
+Ratkaise CAPTCHA pyytääksesi 
siltoja.
+Päivitä CAPTCHA
+Pyydä siltoja
+Päivitä sovellukset
+SOCKS: - HTTP: -
+Sovelluspalvelut
+Käyttäjäpalvelut
+Uusi identiteetti
+VPN pois käytöstä
+Koko laitteen VPN
+Ongelmia yhteydessä\?
+Yhdistä pilvipalvelimien läpi
+Yhdistä yhteisöpalvelimien läpi
+Yhdistä suoraan Toriin 
(Paras)
+EPÄONNISTUI. Kokeile toista 
vaihtoehtoa
+Onnistui. Tor-yhteys on 
kunnossa!
+Onnistui. Siltamääritykset ovat 
kunnossa!
+Kokeillaan yhteyttä Toriin…
+Kokeillaan siltayhteyttä 
Toriin….
+Torilla toimivat sovellukset
+Kertoo exit-solmulle, ettei 
yhdistetä IPv4-osoitteisiin
+Poista käytöstä IPv4-yhteydet
+Kertoo exit-solmulle, että 
IPv6-yhteyksiä suositaan
+Suosi IPv6-yhteyksiä
+