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

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 22 Dec '21

22 Dec '21

commit 28405aef35e477e626492d31d982eb90fed552e6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 22 23:45:10 2021 +0000 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 the Tor network, so that clients can also get it." msgstr "" +"Onion-ресурс загружает этот подписанный дескриптор в _распределенную хэш-" +"таблицу_, которая является частью сети Tor, чтобы клиенты также могли ее " +"получить." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1300,6 +1321,8 @@ msgid "" "It uses an anonymized Tor circuit to do this upload so that it does not " "reveal its location." msgstr "" +"Для этой загрузки он использует анонимизированную сеть Tor, чтобы не " +"раскрывать свое местоположение." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1311,7 +1334,7 @@ msgstr "" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "### Act 3: Where a client wants to visit the onion service" -msgstr "" +msgstr "### Дейтствие 3: Где клиент хочет посетить onion-ресурс" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1319,6 +1342,8 @@ msgid "" "Say you want to anonymously send some tax fraud data to your local newspaper" " through its SecureDrop." msgstr "" +"Допустим, вы хотите анонимно отправить в местную газету данные о налоговом " +"мошенничестве через SecureDrop." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1326,6 +1351,8 @@ msgid "" "You find the onion address for the newspaper's SecureDrop from a public " "website or friend." msgstr "" +"Вы найдете onion-адрес SecureDrop газеты на общедоступном веб-сайте или у " +"друга." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1337,7 +1364,7 @@ msgstr "" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "### Act 4: Where the client introduces itself to the onion service" -msgstr "" +msgstr "### Действие 4: Где клиент знакомится с onion-ресурсом" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1345,6 +1372,8 @@ msgid "" "All the previous steps were just set up for the onion service so that it's " "reachable by clients." msgstr "" +"Все предыдущие шаги были только настройкой onion-ресурса, чтобы он был " +"доступен для клиентов." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1352,6 +1381,7 @@ msgid "" "Now let's fast-forward to the point where an actual client wants to visit " "the service." msgstr "" +"Теперь перейдем к тому моменту, когда реальный клиент хочет посетить ресурс." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1359,6 +1389,8 @@ msgid "" "In this case, the client has the onion address of SecureDrop and want to " "visit it, so they connect to the service with Tor Browser." msgstr "" +"В этом случае у клиента есть onion-адрес SecureDrop и желание его посетить, " +"поэтому он подключается к ресурсу с помощью Tor Browser." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1367,6 +1399,9 @@ msgid "" "_distributed hash table_ from **Step 2** and ask for the signed descriptor " "of SecureDrop's onion service." msgstr "" +"Теперь следующее, что должно произойти, это то, что клиент переходит к " +"_распределенной хеш-таблице_ с **шага 2** и запрашивает подписанный " +"дескриптор SecureDrop onion-ресурса." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1378,7 +1413,7 @@ msgstr "" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "### Act 5: Where the client verify onion address signature" -msgstr "" +msgstr "### Действие 5: Где клиент проверяет подпись onion-адреса" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1386,6 +1421,8 @@ msgid "" "When the client receives the signed descriptor, they verify the signature of" " the descriptor using the public key that is encoded in the onion address." msgstr "" +"Когда клиент получает подписанный дескриптор, он проверяет его подпись, " +"используя открытый ключ, который закодирован в onion-адресе." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 22 Dec '21

22 Dec '21

commit c341b2a479268931178faa271741d8cb42d3825d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 22 23:15:10 2021 +0000 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 "" "speaking(a)torproject.org with your preferred topic, language requirement, " "date, and other details." msgstr "" +"У нас есть специальная группа основных участников Tor, которые готовы " +"выступить на вашем следующем мероприятии. Вы можете запросить докладчика, " +"связавшись с speaking(a)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/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "Is your network filtered and you can't open ports on your firewall?" -msgstr "" +msgstr "Ваша сеть фильтруется, и вы не можете открывать порты на брандмауэре?" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1132,6 +1142,8 @@ msgid "" "This could happen if you are in a university campus, an office, an airport, " "or pretty much anywhere." msgstr "" +"Это может произойти, если вы находитесь в университетском городке, офисе, " +"аэропорту или где угодно." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1139,11 +1151,13 @@ msgid "" "Onion services don't need open ports because they punch through NAT. They " "only establish outgoing connections." msgstr "" +"Onion-ресурсам не нужны открытые порты, потому что они проходят через NAT. " +"Они только устанавливают исходящие соединения." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "## The Onion Service Protocol: Overview" -msgstr "" +msgstr "## The Onion Service Protocol: Обзор" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1151,6 +1165,8 @@ msgid "" "Now the question becomes **what kind of protocol is needed to achieve all " "these properties?**" msgstr "" +"Теперь возникает вопрос **какой протокол нужен для достижения всех этих " +"свойств?**" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1158,6 +1174,8 @@ msgid "" "Usually, people connect to an IP address and are done, but how can you " "connect to something that does not have an IP address?" msgstr "" +"Обычно люди подключаются к IP-адресу и на этом всё, но как вы можете " +"подключиться к тому, что не имеет IP-адреса?" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1165,6 +1183,8 @@ msgid "" "In particular, an onion service's address looks like this: " "`vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd.onion`" msgstr "" +"В частности, адрес onion-ресурса выглядит так: " +"`vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd.onion` " #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1172,12 +1192,16 @@ msgid "" "This looks weird and random because it's the _identity public key_ of the " "onion service." msgstr "" +"Это выглядит странно и случайно, потому что это _identity public key_ onion-" +"ресурса." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "" "That's one of the reasons we can achieve the security properties above." msgstr "" +"И это одна из причин, по которой мы можем достичь указанных выше свойств " +"безопасности." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) @@ -1186,16 +1210,18 @@ msgid "" "introduce itself to the service, and then set up a rendezvous point with the" " service over the Tor network." msgstr "" +"Протокол onion-ресурса использует сеть Tor, чтобы клиент мог представить " +"себя ресурсу, а затем настроить точку встречи с этим ресурсом в сети Tor." #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "Here is a detailed breakdown of how this happens:" -msgstr "" +msgstr "Вот подробное описание того, как это происходит:" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body) msgid "### Act 1: Where the onion service sets up its introduction points" -msgstr "" +msgstr "### Действие 1: Где onion-ресурс устанавливает свои точки введения" #: https//community.torproject.org/onion-services/overview/ #: (content/onion-services/overview/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] new translations in communitytpo-contentspot
by translation＠torproject.org 22 Dec '21

22 Dec '21

commit 8f4d7107d0480101694a6f21999d8a6220f62cc2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 22 22:45:08 2021 +0000 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 <mail(a)putnik.tech>, 2021 # Vincent Breitmoser <look(a)my.amazin.horse>, 2021 -# Transifex Bot <>, 2021 # Legenden Rifk <rekytcsgo(a)gmail.com>, 2021 # Иван Иванов <remove4kebab(a)protonmail.com>, 2021 # Giovanni Pellerano <giovanni.pellerano(a)evilaliv3.org>, 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/ #: (content/training/risks/contents+en.lrpage.title) @@ -558,6 +566,8 @@ msgstr "Риски" msgid "" "Things you should be aware of before running a digital security training." msgstr "" +"Вещи, о которых вы должны знать, прежде чем проводить тренинг по цифровой " +"безопасности." #: (dynamic) msgid "Join the Community"

1 0

[orbot/master] unbinding from tor service will stop tor; don't need to use conn to do it
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f47aff186c391f2f16ec0f2c215e4bdba2c50ca5 Author: n8fr8 <nathan(a)guardianproject.info> 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<String> 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; - } - }; - - /** - BroadcastReceiver receiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (TorService.ACTION_STATUS.equals(intent.getAction()) - && TorService.STATUS_ON.equals(intent.getStringExtra(TorService.EXTRA_STATUS))) { - initControlConnection(); - unregisterReceiver(this); - } + Log.w(OrbotConstants.TAG, "TorService: onBindingDied"); } }; - // run the BroadcastReceiver in its own thread - HandlerThread handlerThread = new HandlerThread(receiver.getClass().getSimpleName()); - handlerThread.start(); - Looper looper = handlerThread.getLooper(); - Handler handler = new Handler(looper); - registerReceiver(receiver, new IntentFilter(TorService.ACTION_STATUS), null, handler); - **/ Intent serviceIntent = new Intent(this, TorService.class); if (Build.VERSION.SDK_INT < 29) {

1 0

[orbot/master] conn may be null, but service may be bound, so make sure it is unbound here
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit da4162833e049c26ebb54468610d1508b398e529 Author: n8fr8 <nathan(a)guardianproject.info> 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();

1 0

[orbot/master] update to 1652200200
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit ec7200b73ad3dd21eaf531d0e00897ac1bd60352 Author: n8fr8 <nathan(a)guardianproject.info> 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"

1 0

[orbot/master] Small bug with deleting unconfigured v3s
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 06e2b8d4856e5ae1c3ae5abd4906e4c36da54341 Author: b <dsnake(a)protonmail.com> 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)); } }

1 0

[orbot/master] Fixes #398 empty notification
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 5792d666ff2ddd3da9200a15f27b24af66e22006 Author: b <dsnake(a)protonmail.com> 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));

1 0

[orbot/master] need to differentiate OrbotService status messages from TorService as it was confusing OrbotMain
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 594f297657e086a4c85fe3b04cde1eeef9b5060b Author: n8fr8 <nathan(a)guardianproject.info> 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

1 0

[orbot/master] don't always send status with every log entry and update
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 694290028484ec19df97893f5551737322d75deb Author: n8fr8 <nathan(a)guardianproject.info> 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<String> 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); });

1 0