- tor-commits - lists.torproject.org

[orbot/master] Merge branch 'eighthave-master'
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 839c3787d64ca57abe2f5e4a5dccc890fe084d7e Merge: aa643f4a dd7152e9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed May 5 13:51:53 2021 -0400 Merge branch 'eighthave-master' .gitmodules | 4 - app-mini/build.gradle | 2 +- app-mini/src/main/assets/common/geoip | 0 app-mini/src/main/assets/common/geoip6 | 0 .../torproject/android/mini/MiniMainActivity.java | 5 +- app/build.gradle | 5 +- .../org/torproject/android/OrbotMainActivity.java | 3 +- .../ui/onboarding/CustomBridgesActivity.java | 4 +- .../android/ui/onboarding/MoatActivity.java | 6 +- external/jtorctl | 1 - orbotservice/build.gradle | 11 +- .../torproject/android/service/OrbotService.java | 455 ++++--------- .../android/service/TorServiceConstants.java | 12 - .../service/util/CustomTorResourceInstaller.java | 71 +- .../java/org/torproject/android/control/.cvsignore | 1 - .../java/org/torproject/android/control/Bytes.java | 114 ---- .../torproject/android/control/ConfigEntry.java | 20 - .../torproject/android/control/EventHandler.java | 75 --- .../torproject/android/control/PasswordDigest.java | 98 --- .../java/org/torproject/android/control/README | 4 - .../android/control/TorControlCommands.java | 148 ----- .../android/control/TorControlConnection.java | 730 --------------------- .../android/control/TorControlError.java | 39 -- .../android/control/TorControlSyntaxError.java | 16 - .../torproject/android/control/examples/.cvsignore | 1 - .../control/examples/DebuggingEventHandler.java | 44 -- .../torproject/android/control/examples/Main.java | 146 ----- .../android/service/ExampleUnitTest.java | 15 - 28 files changed, 173 insertions(+), 1857 deletions(-)

1 0

[orbot/master] update version to 1650100100 (16.5 alpha 1)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2648b294cf2012a396bcaec5d2a1864857c283b0 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed May 5 13:53:16 2021 -0400 update version to 1650100100 (16.5 alpha 1) --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 823c119e..18b18188 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -83,6 +83,7 @@ android { applicationId 'org.torproject.android' targetSdkVersion 29 versionCode 1641300200 + versionCode 1650100100 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] Translated using Weblate (Norwegian Bokmål)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 3055933f1098139b6196a729298d9eb12c9c3457 Author: Allan Nordhøy <epost(a)anotheragency.no> Date: Tue May 4 02:18:23 2021 +0000 Translated using Weblate (Norwegian Bokmål) Currently translated at 85.0% (188 of 221 strings) Translation: Guardian Project/Orbot Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/nb_NO/ --- app/src/main/res/values-nb/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 6356db3a..c321c857 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -151,7 +151,7 @@ <string name="trouble_connecting">Tilkoblingsproblemer?</string> <string name="full_device_vpn">VPN for hele enheten</string> <string name="vpn_disabled">VPN Deaktivert</string> - <string name="wizard_details_msg">Orbot er et fritt program som inneholder Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent og Polipo. Den gir en lokal HTTP-proxy (8118) og en SOCKS-mellomtjener (9050) inn i Tor-nettverket. Orbot har også muligheten til å sende all Internett-trafikk gjennom Tor på enheter med superbrukertilgang.</string> + <string name="wizard_details_msg">Orbot er et fritt program som inneholder Tor, Obfs4Proxy, BadVPN Tun2Socks, og LibEvent. Den gir en lokal HTTP-proxy (8118) og en SOCKS-mellomtjener (9050) inn i Tor-nettverket. Orbot har også muligheten til å sende all Internett-trafikk gjennom Tor på enheter med superbrukertilgang.</string> <string name="hidden_service_request">Et program ønsker å åpne løktjenerport %1$d til Tor-nettverket. Dette er trygt såfremt du stoler på programmet.</string> <string name="pref_open_proxy_on_all_interfaces_title">Åpne proxy på alle grensesnitt</string> <string name="pref_http_title">Tor HTTP</string> @@ -211,4 +211,7 @@ <string name="kibibyte">KiB</string> <string name="mebibyte_per_second">MiB/s</string> <string name="kibibyte_per_second">KiB/s</string> + <string name="confirm">Bekreft</string> + <string name="deny">Nekt</string> + <string name="allow">Tillat</string> </resources> \ No newline at end of file

1 0

[orbot/master] Translated using Weblate (Vietnamese)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2a4662414f2f4a6a12e6fb9a456f6c7289fec9a1 Author: bruh <quangtrung02hn16(a)gmail.com> Date: Tue May 4 03:06:12 2021 +0000 Translated using Weblate (Vietnamese) Currently translated at 100.0% (221 of 221 strings) Translation: Guardian Project/Orbot Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/vi/ --- app/src/main/res/values-vi/strings.xml | 111 +++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index f81b34ca..4b5fb960 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -6,21 +6,21 @@ <string name="status_activated">Đã kết nối với mạng Tor</string> <string name="status_disabled">Orbot đã được vô hiệu hóa</string> <string name="status_shutting_down">Đang tắt dịch vụ Tor</string> - <string name="menu_settings">Thiết lập</string> + <string name="menu_settings">Cài đặt</string> <string name="menu_log">Nhật ký</string> <string name="menu_start">Bắt đầu</string> - <string name="menu_stop">Ngừng</string> - <string name="menu_about">Về</string> - <string name="main_layout_download">Tải về</string> + <string name="menu_stop">Dừng</string> + <string name="menu_about">Giới thiệu</string> + <string name="main_layout_download">Tải xuống</string> <string name="main_layout_upload">Tải lên</string> <string name="button_about">Giới thiệu</string> <string name="menu_exit">Thoát</string> <string name="menu_scan">Quét mã BridgeQR</string> - <string name="menu_share_bridge">Xuất mã BridgeQR</string> + <string name="menu_share_bridge">Chia sẻ mã BridgeQR</string>  <string name="wizard_details">Vài chi tiết về Orbot</string>  - <string name="pref_general_group">Tổng quát</string> + <string name="pref_general_group">Cài đặt chung</string> <string name="pref_start_boot_title">Chạy Orbot khi khởi động thiết bị</string> <string name="pref_start_boot_summary">Tự khởi động Orbot và kết nối vào mạng Tor sau khi thiết bị Android của bạn khởi động</string>  @@ -130,4 +130,103 @@ <string name="openssl_version">OpenSSL: http://www.openssl.org</string> <string name="obfsproxy_version">Obfs4proxy: https://github.com/Yawning/obfs4</string> <string name="wizard_details_msg">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.</string> + <string name="be_a_snowflake_desc">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</string> + <string name="be_a_snowflake_title">Chạy proxy Snowflake</string> + <string name="bridge_snowflake">Kết nối qua các thiết bị Tor ngang hàng khác (thử nghiệm)</string> + <string name="use_qr_code">Sử dụng mã QR</string> + <string name="paste_bridges">Dán các cầu nối</string> + <string name="in_a_browser">Trong một trình duyệt, hãy đi đến %s và nhấn Get Bridges > Just Give Me Bridges!</string> + <string name="use_custom_bridges">Sử dụng cầu nối tuỳ chỉnh</string> + <string name="configure_custom_bridges">Thiết lập cầu nối tuỳ chỉnh</string> + <string name="custom_bridges">Cầu nối tuỳ chỉnh</string> + <string name="request_bridges_from_torproject">Yêu cầu cầu nối từ torproject.org</string> + <string name="enter_characters_from_image">Nhập các ký tự trong hình ảnh</string> + <string name="captcha">Captcha</string> + <string name="pref_reduced_connection_padding_summary">Đóng các kết nối chuyển tiếp sớm hơn và gửi ít gói đặt khoảng cách hơn để giảm sử dụng dữ liệu và pin</string> + <string name="pref_reduced_connection_padding">Giảm khoảng cách kết nối</string> + <string name="pref_connection_padding_summary">Luôn bật đặt khoảng cách cho kết nối để phòng vệ chống lại một số dạng phân tích lưu lượng. Mặc định: tự động</string> + <string name="pref_connection_padding">Đặt khoảng cách cho kết nối</string> + <string name="testing_bridges">Đang thử nghiệm kết nối cầu nối đến Tor….</string> + <string name="app_shortcuts">Ứng dụng được bật Tor</string> + <string name="pref_disable_ipv4_summary">Bảo các lối ra không được kết nối đến các địa chỉ IPv4</string> + <string name="pref_disable_ipv4">Tắt các kết nối IPv4</string> + <string name="pref_prefer_ipv6_summary">Bảo các lối ra rằng các địa chỉ IPv6 được ưu tiên</string> + <string name="pref_prefer_ipv6">Ưu tiên các kết nối IPv6</string> + <string name="pref_reduced_circuit_padding_summary">Sử dụng các thuật toán đặt khoảng cách tốn ít tài nguyên hơn để giảm sử dụng dữ liệu và pin</string> + <string name="pref_reduced_circuit_padding">Giảm khoảng cách cho mạch</string> + <string name="pref_circuit_padding_summary">Bật đặt khoảng cách cho mạch để phòng vệ chống lại một số dạng phân tích lưu lượng</string> + <string name="pref_circuit_padding">Đặt khoảng cách cho mạch</string> + <string name="pref_isolate_dest_summary">Sử dụng một mạch khác cho mỗi địa chỉ đích</string> + <string name="pref_open_proxy_on_all_interfaces_summary">Cho phép các thiết bị Wi-Fi ngang hàng, các thiết bị được chia sẻ mạng và bất kỳ ai có thể kết nối đến IP của bạn truy cập Tor</string> + <string name="pref_isolate_dest">Cô lập các địa chỉ đích đến</string> + <string name="consider_enable_battery_optimizations">Hãy cân nhắc việc bật tối ưu hoá pin</string> + <string name="consider_disable_battery_optimizations">Hãy cân nhắc việc tắt tối ưu hoá pin</string> + <string name="share_as_qr">Chia sẻ dưới dạng QR</string> + <string name="hosted_services">Dịch vụ được lưu trữ</string> + <string name="confirm_cookie_deletion">Xác nhận xoá cookie</string> + <string name="delete_cookie">Xoá cookie</string> + <string name="backup_cookie">Sao lưu cookie</string> + <string name="cookie_from_QR">Đọc từ QR</string> + <string name="onion">.onion</string> + <string name="client_cookies">Cookie khách</string> + <string name="auth_cookie_was_not_configured">Cookie xác thực không được thiết lập</string> + <string name="copy_cookie_to_clipboard">Sao chép cookie vào bộ nhớ tạm</string> + <string name="auth_cookie">Cookie xác thực</string> + <string name="service_type">Loại dịch vụ</string> + <string name="confirm_service_deletion">Xác nhận xoá dịch vụ</string> + <string name="start_tor_again_for_finish_the_process">Khởi động lại Tor để hoàn tất quá trình</string> + <string name="create_a_backup_first">Hãy tạo một bản sao lưu trước tiên</string> + <string name="restore_backup">Khôi phục bản sao lưu</string> + <string name="backup_port_exist">Lỗi: Một dịch vụ Onion đang sử dụng cổng %s rồi</string> + <string name="backup_restored">Đã khôi phục bản sao lưu</string> + <string name="backup_saved_at_external_storage">Đã lưu bản sao lưu ở bộ nhớ ngoài</string> + <string name="delete_service">Xoá dịch vụ</string> + <string name="backup_service">Sao lưu dịch vụ <i>(Cảnh báo: Việc này có thể sẽ làm lộ thiết lập dịch vụ của bạn cho các ứng dụng khác)</i></string> + <string name="show_auth_cookie">Hiện cookie xác thực</string> + <string name="copy_address_to_clipboard">Sao chép địa chỉ vào bộ nhớ tạm</string> + <string name="done">Xong!</string> + <string name="onion_port">Cổng Onion</string> + <string name="local_port">Cổng cục bộ</string> + <string name="menu_hidden_services">Dịch vụ Onion</string> + <string name="title_activity_hidden_services">Dịch vụ Onion</string> + <string name="confirm">Xác nhận</string> + <string name="v3_import_auth_private">Nhập .auth_private</string> + <string name="v3_backup_name_hint">Tên tệp sao lưu…</string> + <string name="v3_delete_client_authorization_confirm">Xoá uỷ quyền khách</string> + <string name="v3_delete_client_authorization">Xoá mã uỷ quyền khách</string> + <string name="v3_backup_key_warning">Cảnh báo: Việc này có thể sẽ làm lộ mã của bạn cho các ứng dụng khác</string> + <string name="v3_backup_key">Sao lưu mã uỷ quyền khách</string> + <string name="v3_onion">Miền .onion v3</string> + <string name="v3_key_hash">Mã khoá riêng tư x25519 trong Base 32</string> + <string name="v3_client_auth_activity_title">Uỷ quyền khách v3</string> + <string name="v3_client_auth">Uỷ quyền khách cho dịch vụ Onion v3</string> + <string name="v3_hosted_services">Dịch vụ Onion v3 được lưu trữ</string> + <string name="v2_hidden_services">Dịch vụ Onion v2 (Không được hỗ trợ nữa)</string> + <string name="mebibyte">MiB</string> + <string name="kibibyte">KiB</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> + <string name="refresh_apps">Làm mới các ứng dụng</string> + <string name="default_socks_http">SOCKS: - HTTP: -</string> + <string name="app_services">Dịch vụ ứng dụng</string> + <string name="user_services">Dịch vụ người dùng</string> + <string name="menu_new_identity">Danh tính mới</string> + <string name="vpn_disabled">VPN bị tắt</string> + <string name="full_device_vpn">VPN thiết bị đầy đủ</string> + <string name="trouble_connecting">Gặp vấn đề khi kết nối\?</string> + <string name="bridge_cloud">Kết nối thông qua các máy chủ đám mây</string> + <string name="bridge_community">Kết nối thông qua các máy chủ cộng đồng</string> + <string name="bridge_direct_connect">Kết nối trực tiếp đến Tor (Tốt nhất)</string> + <string name="testing_bridges_fail">THẤT BẠI. Hãy thử một tuỳ chọn khác</string> + <string name="testing_tor_direct_success">Thành công. Kết nối đến Tor tốt rồi!</string> + <string name="testing_bridges_success">Thành công. Thiết lập cầu nối tốt rồi!</string> + <string name="testing_tor_direct">Đang thử nghiệm kết nối đến Tor…</string> + <string name="request_bridges">Yêu cầu cầu nối</string> + <string name="solve_captcha_instruction">Giải CAPTCHA để yêu cầu cầu nối.</string> + <string name="refresh_captcha">Làm mới CAPTCHA</string> + <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">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…</string> + <string name="hidden_services">Dịch vụ Onion</string> + <string name="vpn_default_world">Toàn cầu (Tự động)</string> + <string name="apps_mode">Chế độ VPN</string> + <string name="get_bridges_email_request">Yêu cầu cầu nối qua Email</string> </resources> \ No newline at end of file

1 0

[orbot/master] remove gpmaven repo, get jsockAndroid directly via jitpack.io
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 377fd63cc3500b285d227df595e3c801bb468152 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri May 7 14:47:15 2021 -0400 remove gpmaven repo, get jsockAndroid directly via jitpack.io --- build.gradle | 16 ++-------------- orbotservice/build.gradle | 3 +-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index e840c979..357a92ba 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - kotlin_version = '1.4.21' + kotlin_version = '1.4.32' } repositories { mavenCentral() google() maven { url 'https://jitpack.io' } - maven { - url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" - content { - includeGroup('info.pluggabletransports.aptds') - } - } } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0-rc01' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -25,11 +19,5 @@ allprojects { mavenCentral() google() maven { url 'https://jitpack.io' } - maven { - url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" - content { - includeGroup('info.pluggabletransports.aptds') - } - } } } diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index c2704caa..67141aca 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -48,8 +48,7 @@ android { dependencies { implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - - implementation 'info.pluggabletransports.aptds:jsocksAndroid:1.0.4' + implementation 'com.gitlab.guardianproject:jsocksandroid:1.0.4' implementation 'com.jaredrummler:android-shell:1.0.0' //implementation fileTree(dir: 'libs', include: ['.so','.aar'])

1 0

[orbot/master] Translated using Weblate (Portuguese (Portugal))
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 8ecb756faf0af221139ec89b2a2f991df567e48d Author: ssantos <ssantos(a)web.de> Date: Wed May 5 20:35:35 2021 +0000 Translated using Weblate (Portuguese (Portugal)) Currently translated at 100.0% (221 of 221 strings) Translation: Guardian Project/Orbot Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/pt_PT/ --- app/src/main/res/values-pt-rPT/strings.xml | 66 ++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 8eb9aee7..de30e512 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -22,7 +22,7 @@  <string name="pref_general_group">Geral</string> <string name="pref_start_boot_title">Iniciar o Orbot no Arranque</string> - <string name="pref_start_boot_summary">Iniciar automaticamente o Orbot e conetar o Tor quando o seu dispositivo Android inicia</string> + <string name="pref_start_boot_summary">Iniciar automaticamente o Orbot e conetar o Tor quando o seu aparelho Android inicia</string>    @@ -50,7 +50,7 @@ <string name="done">Concluído!</string> <string name="disable">Desativar</string> <string name="enable">Ativar</string> - <string name="wizard_details_msg">O Orbot é um software de código aberto que contem Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent e Polipo. Ele fornece um proxy local HTTP (8118) e um proxy SOCKS (9050) como acesso a rede Tor. Orbot também tem a habilidade, em aparelhos com acesso root, de enviar todo o trafego de Internet via a rede Tor.</string> + <string name="wizard_details_msg">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 aparelhos com acesso root, de enviar todo o trafego de Internet via rede Tor.</string> <string name="pref_proxy_type_dialog">Inserir Tipo de Proxy</string> <string name="pref_proxy_port_dialog">Inserir Porta do Proxy</string> <string name="pref_proxy_username_summary">Nome do Utilizador do Proxy (Opcional)</string> @@ -71,7 +71,7 @@ <string name="pref_isolate_dest">Isolar os endereços de destino</string> <string name="pref_disable_ipv4_summary">Diz às saídas para não se conectarem a endereços IPv4</string> <string name="found_existing_tor_process">processo Tor existente foi encontrado…</string> - <string name="app_services">Serviços de aplicação</string> + <string name="app_services">Serviços de app</string> <string name="pref_reduced_connection_padding">Preenchimento de conexão reduzido</string> <string name="start_tor_again_for_finish_the_process">Reiniciar o Tor para terminar o processo</string> <string name="delete_cookie">Eliminar cookie</string> @@ -86,7 +86,7 @@ <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos</string> <string name="pref_http_summary">Porta em que o Tor oferece o seu proxy HTTP (predefinição: 8118 ou 0 para desativar)</string> <string name="confirm_cookie_deletion">Confirmar eliminação de cookies</string> - <string name="client_cookies">Cookies de clientes</string> + <string name="client_cookies">Cookie dos Clientes</string> <string name="pref_connection_padding">Preenchimento de conexão</string> <string name="pref_open_proxy_on_all_interfaces_title">Abrir o Proxy em Todas as Interfaces</string> <string name="pref_http_dialog">Configuração da Porta HTTP</string> @@ -103,14 +103,14 @@ <string name="menu_hidden_services">Serviços ocultos</string> <string name="pref_proxy_type_summary">Protocolo para usar para o servidor proxy: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_port_summary">Porta do Servidor Proxy</string> - <string name="pref_proxy_password_dialog">Inserir Senha do Proxy</string> - <string name="pref_proxy_password_title">Senha do Proxy de Saída</string> + <string name="pref_proxy_password_dialog">Inserir palavra-passe do proxy</string> + <string name="pref_proxy_password_title">Palavra-passe do proxy de saída</string> <string name="pref_proxy_title">Proxy de Rede de Saída (Opcional)</string> <string name="pref_use_expanded_notifications_title">Notificações Estendidas</string> <string name="bridges_updated">Pontes Atualizadas</string> <string name="pref_proxy_host_title">Anfitrião Proxy de Saída</string> <string name="pref_proxy_host_dialog">Inserir Hospedeiro Proxy</string> - <string name="pref_proxy_password_summary">Senha do Proxy (Opcional)</string> + <string name="pref_proxy_password_summary">Palavra-passe do Proxy (Opcional)</string> <string name="project_home">Projeto Home(s):</string> <string name="pref_proxy_type_title">Tipo de Proxy de Saída</string> <string name="hidden_services">Serviços ocultos</string> @@ -127,7 +127,7 @@ <string name="bridge_direct_connect">Conecte-se diretamente ao Tor (O melhor)</string> <string name="testing_bridges_fail">FALHOU. Tente outra opção</string> <string name="testing_bridges_success">Sucesso. A configuração da Ponte está boa!</string> - <string name="testing_bridges">Testando a ponte de conexão com o Tor…</string> + <string name="testing_bridges">Testando a ponte de conexão com o Tor….</string> <string name="app_shortcuts">Aplicações ativadas para o Tor</string> <string name="share_as_qr">Compartilhar como QR</string> <string name="please_restart_Orbot_to_enable_the_changes">Por favor reinicie Orbot para ativar as mundanças</string> @@ -140,14 +140,14 @@ <string name="backup_restored">Backup restaurado</string> <string name="backup_saved_at_external_storage">Backup gravado em mídia externa</string> <string name="delete_service">Remover Serviço</string> - <string name="backup_service">Serviço de Backup</string> + <string name="backup_service">Serviço de Backup <i>(Aviso: Isso pode expor a sua configuração de serviço para as outras apps)</i></string> <string name="show_auth_cookie">Mostre cookie de autenticação</string> <string name="copy_address_to_clipboard">Copiar para a area de transferência</string> <string name="onion_port">Porta Onion</string> <string name="local_port">Porta Local</string> <string name="vpn_default_world">Global (Automático)</string> <string name="apps_mode">Modo VPN</string> - <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Se a sua rede móvel bloqueia o Tor, pode utilizar um \'Servidor Ponte\' como alternativa contra o bloqueio. SELECIONE umas das opções para configurar e testar..,.</string> + <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Se a sua rede móvel bloqueia o Tor, pode utilizar um \'Servidor Ponte\' como alternativa contra o bloqueio. SELECIONE umas das opções para configurar e testar…</string> <string name="restart_orbot_to_use_this_bridge_">Por favor reinicie Orbot para ativar as mundanças</string> <string name="pref_torrc_dialog">Torrc Personalizado</string> <string name="pref_torrc_summary">SOMENTE EXPERIENTES: adicione sua própria linha de configuração torrc</string> @@ -163,7 +163,7 @@ <string name="pref_disable_network_title">Sem Rede, Modo de Latência Automática</string> <string name="pref_use_expanded_notifications">Mostrar as notificação expandida com o Tor, país de saída e o IP</string> <string name="pref_use_persistent_notifications">Mantenha sempre um ícone na barra de ferramentas quando o Orbot estiver conectado</string> - <string name="hidden_service_request">Uma aplicação quer abrir uma porta do servidor onion %1$d para a rede Tor. É seguro caso confie nesta aplicação.</string> + <string name="hidden_service_request">Uma app quer abrir uma porta no servidor onion %1$d para a rede Tor. É seguro caso confie nesta app.</string> <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> <string name="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ativar os registos de depuração para saída (deve usar adb ou aLogCat para ver)</string> @@ -181,10 +181,52 @@ <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Impressões digitais, apelidos, países e endereços para a última etapa</string> <string name="your_relay_settings_caused_an_exception_">As suas configurações de retransmissão causaram uma exceção!</string> <string name="your_reachableaddresses_settings_caused_an_exception_">As suas configurações de Endereços Acessíveis causou uma exceção!</string> - <string name="pref_allow_background_starts_summary">Deixar uma aplicação informar o Orbot para iniciar o Tor e os seus serviços relacionados</string> + <string name="pref_allow_background_starts_summary">Deixar uma app informar o Orbot para iniciar o Tor e os seus serviços relacionados</string> <string name="pref_allow_background_starts_title">Permitir Inicializações em Segundo Plano</string> <string name="pref_entrance_node_dialog">Digite os Nós de Entrada</string> <string name="pref_entrance_node_summary">Impressões digitais, apelidos, países e endereços para a primeira etapa</string> <string name="pref_entrance_node">Nós de Entrada</string> <string name="pref_node_configuration_summary">Aqui estão as configurações avançadas que podem reduzir o seu anonimato</string> + <string name="be_a_snowflake_desc">Permita que os outros utilizadores do Tor se conectem ao Tor através do seu aparelho</string> + <string name="be_a_snowflake_title">Execute o proxy Snowflake</string> + <string name="bridge_snowflake">Conecte através dos outros pares Tor (experimental)</string> + <string name="use_qr_code">Use um Código QR</string> + <string name="paste_bridges">Colar as Pontes</string> + <string name="in_a_browser">Visite o %s com um navegador e toque no Get Bridges > Just Give Me Bridges!</string> + <string name="use_custom_bridges">Use Pontes Personalizadas</string> + <string name="configure_custom_bridges">Configure as Pontes Personalizadas</string> + <string name="custom_bridges">Pontes Personalizadas</string> + <string name="request_bridges_from_torproject">Solicite pontes do torproject.org</string> + <string name="enter_characters_from_image">Digite os caracteres da imagem</string> + <string name="captcha">Captcha</string> + <string name="solve_captcha_instruction">Para solicitar pontes resolva o CAPTCHA.</string> + <string name="refresh_captcha">Atualize o CAPTCHA</string> + <string name="request_bridges">Solicitar Pontes</string> + <string name="testing_tor_direct_success">Sucesso. A conexão com o Tor é boa!</string> + <string name="testing_tor_direct">Testando a conexão com o Tor…</string> + <string name="pref_reduced_circuit_padding_summary">Use menos algoritmos de preenchimento para reduzir o uso dos dados e da bateria</string> + <string name="pref_reduced_circuit_padding">Preenchimento reduzido do circuito</string> + <string name="pref_circuit_padding_summary">Ative o preenchimento do circuito para se defender contra algumas formas de análise de tráfego</string> + <string name="pref_circuit_padding">Preenchimento do circuito</string> + <string name="backup_port_exist">Erro: Um serviço Onion já está usando a porta %s</string> + <string name="confirm">Confirme</string> + <string name="v3_import_auth_private">Importe o .auth_private</string> + <string name="v3_backup_name_hint">Nome do ficheiro de backup…</string> + <string name="v3_delete_client_authorization_confirm">Exclua a autorização do cliente</string> + <string name="v3_delete_client_authorization">Exclua a chave de autorização do cliente</string> + <string name="v3_backup_key_warning">Aviso: Isso pode expor a sua chave a os outras apps</string> + <string name="v3_backup_key">Chave de autorização do cliente de backup</string> + <string name="v3_onion">Domínio v3 .onion</string> + <string name="v3_key_hash">Chave privada x25519 na Base 32</string> + <string name="v3_client_auth_activity_title">Autorização v3 do cliente</string> + <string name="v3_client_auth">Autorização do cliente do serviço Onion v3</string> + <string name="v3_hosted_services">Serviços Onion v3 hospedados</string> + <string name="v2_hidden_services">v2 Onion Services (Descontinuado)</string> + <string name="get_bridges_email_request">Solicite Pontes através do E-mail</string> + <string name="mebibyte">MiB</string> + <string name="kibibyte">KiB</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> + <string name="deny">Negue</string> + <string name="allow">Permita</string> </resources> \ No newline at end of file

1 0

[orbot/master] update orbotservice target SDK to 30 to match the app
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit c6dab3046a7daa87863a09d173d87e074dbb2270 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri May 7 15:09:31 2021 -0400 update orbotservice target SDK to 30 to match the app --- orbotservice/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 67141aca..9f79f17f 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -13,7 +13,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 30 } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8

1 0

[orbot/master] add overall preference for enabling/disabling onion service hosting
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 0e39a7776c03d82f8e5dc08a639b401b75de0f08 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu May 20 10:50:49 2021 -0400 add overall preference for enabling/disabling onion service hosting --- orbotservice/build.gradle | 2 +- orbotservice/src/main/assets/fronts | 5 +- .../torproject/android/service/OrbotService.java | 126 ++++++++++----------- .../org/torproject/android/service/util/Prefs.java | 10 ++ 4 files changed, 75 insertions(+), 68 deletions(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 9f79f17f..67770146 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -64,5 +64,5 @@ dependencies { api 'info.guardianproject:jtorctl:0.4.5.7' implementation 'info.guardianproject:tor-android:0.4.5.7' - implementation 'com.github.tladesignz:IPtProxy:0.5.2' + implementation 'com.github.tladesignz:IPtProxy:0.6.0' } diff --git a/orbotservice/src/main/assets/fronts b/orbotservice/src/main/assets/fronts index 6782446d..6cafa57b 100644 --- a/orbotservice/src/main/assets/fronts +++ b/orbotservice/src/main/assets/fronts @@ -1,5 +1,6 @@ -snowflake https://d2kt284300pde7.cloudfront.net/ -snowflake-stun stun:stun.l.google.com:19302 +snowflake-target https://snowflake-broker.torproject.net.global.prod.fastly.net/ +snowflake-front cdn.sstatic.net +snowflake-stun stun:stun.stunprotocol.org:3478 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/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 5077ed6c..ed463752 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -296,32 +296,29 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private void stopTorAsync() { - new Thread(() -> { - Log.i("OrbotService", "stopTor"); - try { - sendCallbackStatus(STATUS_STOPPING); - sendCallbackLogMessage(getString(R.string.status_shutting_down)); - - if (useIPtObfsMeekProxy()) - IPtProxy.stopObfs4Proxy(); + Log.i("OrbotService", "stopTor"); + try { + sendCallbackStatus(STATUS_STOPPING); + sendCallbackLogMessage(getString(R.string.status_shutting_down)); - if (useIPtSnowflakeProxy()) - IPtProxy.stopSnowflake(); + if (useIPtObfsMeekProxy()) + IPtProxy.stopObfs4Proxy(); + if (useIPtSnowflakeProxy()) + IPtProxy.stopSnowflake(); - stopTorDaemon(true); + stopTor(); - //stop the foreground priority and make sure to remove the persistant notification - stopForeground(true); + //stop the foreground priority and make sure to remove the persistant notification + stopForeground(true); - sendCallbackLogMessage(getString(R.string.status_disabled)); - } catch (Exception e) { - logNotice("An error occured stopping Tor: " + e.getMessage()); - sendCallbackLogMessage(getString(R.string.something_bad_happened)); - } - clearNotifications(); - sendCallbackStatus(STATUS_OFF); - }).start(); + sendCallbackLogMessage(getString(R.string.status_disabled)); + } catch (Exception e) { + logNotice("An error occured stopping Tor: " + e.getMessage()); + sendCallbackLogMessage(getString(R.string.something_bad_happened)); + } + clearNotifications(); + sendCallbackStatus(STATUS_OFF); } private void stopTorOnError(String message) { @@ -377,11 +374,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private void startSnowflakeClient() { //this is using the current, default Tor snowflake infrastructure - String front = getCdnFront(this,"snowflake"); + String target = getCdnFront(this, "snowflake-target"); + String front = getCdnFront(this,"snowflake-front"); String stunServer = getCdnFront(this, "snowflake-stun"); - IPtProxy.startSnowflake(stunServer, front, - null, null, true, false, true, 3); + IPtProxy.startSnowflake(stunServer, target, front, + null, true, false, true, 3); } @@ -408,41 +406,33 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb boolean unsafeLogging = false; IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, logFile, keepLocalAddresses, unsafeLogging); } + + private void stopSnowflakeProxy () { + + IPtProxy.stopSnowflakeProxy(); + } /** * if someone stops during startup, we may have to wait for the conn port to be setup, so we can properly shutdown tor */ - private void stopTorDaemon(boolean waitForConnection) throws Exception { + private void stopTor() throws Exception { - int tryCount = 0; - - while (tryCount++ < 3) { - 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); - } + if (conn != null) { + logNotice("Using control port to shutdown Tor"); - if (shouldUnbindTorService) { - unbindService(torServiceConnection); - shouldUnbindTorService = false; - } + try { + logNotice("sending HALT signal to Tor process"); + conn.shutdownTor(TorControlCommands.SIGNAL_SHUTDOWN); - conn = null; - break; + } catch (IOException e) { + Log.d(OrbotConstants.TAG, "error shutting down Tor via connection", e); } - if (!waitForConnection) - break; - - try { - Thread.sleep(3000); - } catch (Exception e) { + if (shouldUnbindTorService) { + unbindService(torServiceConnection); + shouldUnbindTorService = false; } + + conn = null; } } @@ -728,7 +718,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackStatus(STATUS_STARTING); // make sure there are no stray daemons running - stopTorDaemon(false); + stopTor(); showToolbarNotification(getString(R.string.status_starting_up), NOTIFY_ID, R.drawable.ic_stat_tor); //sendCallbackLogMessage(getString(R.string.status_starting_up)); @@ -742,15 +732,18 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } runTorShellCmd(); - try { - updateLegacyV2OnionNames(); - } catch (SecurityException se) { - logNotice("unable to upload legacy v2 onion names"); - } - try { - updateV3OnionNames(); - } catch (SecurityException se) { - logNotice("unable to upload v3 onion names"); + + if (Prefs.hostOnionServicesEnabled()) { + try { + updateLegacyV2OnionNames(); + } catch (SecurityException se) { + logNotice("unable to upload legacy v2 onion names"); + } + try { + updateV3OnionNames(); + } catch (SecurityException se) { + logNotice("unable to upload v3 onion names"); + } } } catch (Exception e) { logException("Unable to start Tor: " + e.toString(), e); @@ -1205,11 +1198,14 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return null; } - ContentResolver contentResolver = getApplicationContext().getContentResolver(); - addV3OnionServicesToTorrc(extraLines, contentResolver); - addV3ClientAuthToTorrc(extraLines, contentResolver); - addV2HiddenServicesToTorrc(extraLines, contentResolver); - addV2ClientCookiesToTorrc(extraLines, contentResolver); + if (Prefs.hostOnionServicesEnabled()) { + ContentResolver contentResolver = getApplicationContext().getContentResolver(); + addV3OnionServicesToTorrc(extraLines, contentResolver); + addV3ClientAuthToTorrc(extraLines, contentResolver); + addV2HiddenServicesToTorrc(extraLines, contentResolver); + addV2ClientCookiesToTorrc(extraLines, contentResolver); + } + return extraLines; } 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 1b2922a7..5c36793d 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,8 @@ 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 PREF_BE_A_SNOWFLAKE = "pref_be_a_snowflake"; + private final static String PREF_HOST_ONION_SERVICES = "pref_host_onionservices"; + private static SharedPreferences prefs; @@ -37,6 +39,14 @@ public class Prefs { prefs.edit().putString(key, value).apply(); } + public static boolean hostOnionServicesEnabled () { + return prefs.getBoolean(PREF_HOST_ONION_SERVICES, true); + } + + public static void putHostOnionServicesEnabled(boolean value) { + putBoolean(PREF_HOST_ONION_SERVICES, value); + } + public static boolean bridgesEnabled() { //if phone is in Farsi, enable bridges by default boolean bridgesEnabledDefault = Locale.getDefault().getLanguage().equals("fa");

1 0

[orbot/master] Translated using Weblate (Portuguese (Brazil))
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 6793a99ae6d170cd521aeeb5a9a2da2c7dc63843 Author: Wellington Terumi Uemura <wellingtonuemura(a)gmail.com> Date: Sun May 2 03:53:06 2021 +0000 Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (221 of 221 strings) Translation: Guardian Project/Orbot Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/pt_BR/ --- app/src/main/res/values-pt-rBR/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7a0ce2d6..e02b7c9d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -228,4 +228,5 @@ <string name="v2_hidden_services">v2 Onion Services (Descontinuado)</string> <string name="deny">Negue</string> <string name="allow">Permita</string> + <string name="backup_port_exist">Erro: Um serviço Onion já está usando a porta %s</string> </resources> \ No newline at end of file

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit e6fb6252f13a34913166146aca696a0ddeb05c01 Merge: 976b0340 c7bb4ec9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu May 20 10:51:15 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot .../org/torproject/android/OrbotMainActivity.java | 3 +- app/src/main/res/values-nb/strings.xml | 5 +- app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 66 +++++++++--- app/src/main/res/values-pt/strings.xml | 54 ++++++++-- app/src/main/res/values-vi/strings.xml | 111 +++++++++++++++++++-- 6 files changed, 214 insertions(+), 26 deletions(-)

1 0