Merge remote-tracking branch 'upstream/master'

CHANGELOG

@@ -1,3 +1,26 @@
+/** 16.3.3-RC-1-tor-0.4.3.6 / 20 November 2020 **/
+daa2e7b4 (HEAD -> master) update version code to 1633300100
+e88c84aa (origin/master, origin/HEAD) remove quotes from string
+a2158981 (tag: 16.3.3-BETA-2-tor-0.4.3.6) update version to 1633100200
+d6ebcd7e improve logic for start/stop/reconnect of tor to handle orphaned processes - if someone rapidly stops/starts tor, there can be a case where a tor process is launched and not shutdown. This can currently cause the UI to hang and be unable to start tor or connecting to an exsiting control port.
+68aa65b4 externalize log strings
+9a21cd65 Merge branch 'master' of github.com:guardianproject/orbot
+05e9dd8f Merge pull request #412 from bitmold/IPtProxy_aar_module
+e81e50cd Merge branch 'master' of github.com:guardianproject/orbot
+a5a146c8 Made IPtProxy a module, only ship app with one AAR file
+4a39df4e added maxSdkVersion18 for WRITE_EXTERNAL_STORAGE prem
+9a7ef0d8 deleted superflous comments
+5ef1da70 removed unused constants/warnings
+3afa7612 (tag: 16.3.3-BETA-1-tor-0.4.3.6) update version code to 1633100100
+317923b7 Merge pull request #411 from guardianproject/dev_iptproxy
+42b65133 (origin/dev_iptproxy, dev_iptproxy) remove unused bridge list loop
+8d7a79a5 add use IPtProxy function
+4e7ecdef use IPtProxy instead of the AndroidPT dependency
+be40bf56 modifying dependencies to support use of AAR for IPtProxy (temporarily)
+b3006347 the main app needs access to the aar for building as well
+0e33a652 add IPtProxy as aar for now
+075c6ddf update gradle and tools
+50ee0d6f small changes to ensure handling of auto start on boot
 
 /** 16.3.2-RC-1-tor-0.4.3.6 / 2 November 2020 / c69a217aa8e1f09a34634da50e7af55c4fc73a21 **/
 

LICENSE

@@ -4,7 +4,7 @@ provide anonymity on the Internet from a Google Android smartphone.
 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/orbot
+For more information about Orbot, see https://guardianproject.info/apps/org.torproject.android/
 
 If you got this file as a part of a larger bundle, there may be other
 license terms that you should be aware of.

app-mini/src/main/res/values-ar/strings.xml

@@ -116,8 +116,6 @@
   <string name="pref_torrc_title">ترتيبات خاصة بـ torrc</string>
   <string name="pref_torrc_summary">للخبراء فقط : أدخل أسطر ملف torrc مباشرةً</string>
   <string name="pref_torrc_dialog">torrc خاص</string>
-  <string name="kbps">كيلوبيت في الثانية</string>
-  <string name="mbps">ميغابيت في الثانية</string>
   <string name="kb">كيلوبايت</string>
   <string name="mb">ميغابايت</string>
   <string name="bridges_updated">تم تحديث الجسور</string>

app-mini/src/main/res/values-ay/strings.xml

@@ -119,8 +119,6 @@
   <string name="pref_torrc_title">Torrc mayjt\'ayaña</string>
   <string name="pref_torrc_summary">YATIRINAKATAKIKI: torrc apthapitan chiqak mayjt\'ayam</string>
   <string name="pref_torrc_dialog">Maynipachpatak Torrc kuttayaña</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Jichhaptayat jalakipañanaka</string>

app-mini/src/main/res/values-az/strings.xml

@@ -116,8 +116,6 @@ LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="pref_torrc_title">Torrc Custom Config</string>
   <string name="pref_torrc_summary">YALNIZ EKSPERTLƏR: birbaşa torrc config xətlərini daxil edin</string>
   <string name="pref_torrc_dialog">Custom Torrc</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Körpülər yeniləndi</string>

app-mini/src/main/res/values-be/strings.xml

@@ -119,8 +119,6 @@
   <string name="pref_torrc_title">Карыстальніцкія налады Torrc</string>
   <string name="pref_torrc_summary">ТОЛЬКІ ДЛЯ ЭКСПЕРТАЎ: унясіце налады наўпрост у радкі файла канфігурацыі torrc</string>
   <string name="pref_torrc_dialog">Карыстальніцкі Torrc</string>
-  <string name="kbps">кбіт/с</string>
-  <string name="mbps">мбіт/с</string>
   <string name="kb">КБ</string>
   <string name="mb">МБ</string>
   <string name="bridges_updated">Масты абноўлены</string>

app-mini/src/main/res/values-bg/strings.xml

@@ -115,8 +115,6 @@
   <string name="pref_torrc_title">Torrc Custom Config</string>
   <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: въведи директно torrc конфигурационният код</string>
   <string name="pref_torrc_dialog">Ръчно настроен Torrc</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Мостове включени!</string>

app-mini/src/main/res/values-ca/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Configuració personalitzada del Torrc</string>
   <string name="pref_torrc_summary">NOMÉS EXPERTS: Escriviu les línies de configuració directa del Torrc</string>
   <string name="pref_torrc_dialog">Torrc personalitzat</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">S\'han actualitzat els ponts</string>

app-mini/src/main/res/values-cs-rCZ/strings.xml

@@ -114,8 +114,6 @@
   <string name="pref_torrc_title">Torrc vstastní konfigurace</string>
   <string name="pref_torrc_summary">POUZE PRO EXPERTY: zadejte přímo řádky nastavení torrc</string>
   <string name="pref_torrc_dialog">Vlastní Torrs</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">kB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Bridge aktualizovány</string>

app-mini/src/main/res/values-de/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Benutzerdefinierte Torrc-Konfiguration</string>
   <string name="pref_torrc_summary">NUR FÜR EXPERTEN: torrc-Konfigurationszeilen direkt eingeben</string>
   <string name="pref_torrc_dialog">Benutzerdefinierter Torrc</string>
-    <string name="kbps">Kbit/s</string>
-  <string name="mbps">Mbit/s</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Brücken Aktualisiert</string>

app-mini/src/main/res/values-el/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Torrc Custom Config</string>
   <string name="pref_torrc_summary">ΜΟΝΟ ΓΙΑ ΕΙΔΙΚΟΥΣ: πληκτρολογήστε απευθείας torrc config γραμμές</string>
   <string name="pref_torrc_dialog">Προσαρμογή Torrc</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Οι γέφυρες ενημερώθηκαν</string>

app-mini/src/main/res/values-es-rAR/strings.xml

@@ -102,8 +102,6 @@
     <string name="pref_socks_title">Tor SOCKS</string>
   <string name="pref_dnsport_title">Puerto DNS Tor</string>
   <string name="pref_dnsport_dialog">Configuración del Puerto DNS</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="get_bridges_email">Email</string>

app-mini/src/main/res/values-es/strings.xml

@@ -121,8 +121,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="pref_torrc_title">Configuración personalizada de torrc</string>
   <string name="pref_torrc_summary">SÓLO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc</string>
   <string name="pref_torrc_dialog">torrc personalizado</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Bridges actualizados</string>

app-mini/src/main/res/values-eu/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Torrc konfigurazio pertsonala</string>
   <string name="pref_torrc_summary">ADITUAK BESTERIK EZ: sartu torrc konfigurazio lerroak</string>
   <string name="pref_torrc_dialog">Torrc pertsonalizatua</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Zubiak eguneratuta</string>

app-mini/src/main/res/values-fa/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string>
   <string name="pref_torrc_summary">فقط متخصصان:  enter direct torrc config lines</string>
   <string name="pref_torrc_dialog">سفارشی Torrc</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Bridges به روز شدند</string>

app-mini/src/main/res/values-fi/strings.xml

@@ -115,8 +115,6 @@
   <string name="pref_torrc_title">Torrc:n mukautetut asetukset</string>
   <string name="pref_torrc_summary">VAIN ASIANTUNTIJAT: syötä torrc:n määritysrivejä suoraan</string>
   <string name="pref_torrc_dialog">Mukautettu torrc</string>
-  <string name="kbps">kilobittiä per sekunti</string>
-  <string name="mbps">megabittiä per sekunti</string>
   <string name="kb">kt</string>
   <string name="mb">Mt</string>
   <string name="bridges_updated">Sillat päivitetty</string>

app-mini/src/main/res/values-fr-rFR/strings.xml

@@ -115,8 +115,6 @@
   <string name="pref_torrc_title">Configuration personnalisée de Torrc</string>
   <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string>
   <string name="pref_torrc_dialog">Personnaliser Torrc </string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">Ko</string>
   <string name="mb">Mo</string>
   <string name="bridges_updated">Ponts mis à jour</string>

app-mini/src/main/res/values-fr/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Configuration personnalisée de Torrc</string>
   <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string>
   <string name="pref_torrc_dialog">Personnaliser Torrc </string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">Ko</string>
   <string name="mb">Mo</string>
   <string name="bridges_updated">Ponts mis à jour</string>

app-mini/src/main/res/values-gl/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Axuste Torrc personalizado</string>
   <string name="pref_torrc_summary">SO PARA EXPERTAS: introducir liñas de configuración directa torrc</string>
   <string name="pref_torrc_dialog">Torrc personalizado</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Pontes actualizadas</string>

app-mini/src/main/res/values-he/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">תצורה מותאמת אישית של Torrc</string>
   <string name="pref_torrc_summary">מומחים בלבד: הכנס שורות תצורת torrc ישיר</string>
   <string name="pref_torrc_dialog">Torrc מותאם אישית</string>
-    <string name="kbps">ק\"ב/ש</string>
-  <string name="mbps">מ\"ב/ש</string>
   <string name="kb">ק\"ב</string>
   <string name="mb">מ\"ב</string>
   <string name="bridges_updated">גשרים עודכנו</string>

app-mini/src/main/res/values-hi/strings.xml

@@ -121,8 +121,6 @@
   <string name="pref_torrc_title">टोररक कस्टम कॉन्फ़िग</string>
   <string name="pref_torrc_summary">केवल विशेषज्ञ: प्रत्यक्ष टॉर्च कॉन्फ़िग लाइनें दर्ज करें</string>
   <string name="pref_torrc_dialog">कस्टम टोररक</string>
-    <string name="kbps">केबीपीएस</string>
-  <string name="mbps">एमबीपीएस</string>
   <string name="kb">कब</string>
   <string name="mb">मब </string>
   <string name="bridges_updated">पुल अपडेटेड </string>

app-mini/src/main/res/values-hr/strings.xml

@@ -115,8 +115,6 @@
   <string name="pref_torrc_title">Torrc prilagođena konfiguracija</string>
   <string name="pref_torrc_summary">SAMO ZA STRUČNJAKE: unesite direktno torrc konfiguracijske linije</string>
   <string name="pref_torrc_dialog">Prilagođeni Torrc</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Mostova ažurirano</string>

app-mini/src/main/res/values-hu/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Torrc egyedi konfiguráció</string>
   <string name="pref_torrc_summary">CSAK SZAKÉRTŐKNEK: torrc konfigurációs sorok közvetlen beírása</string>
   <string name="pref_torrc_dialog">Egyedi Torrc</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Hidak frissítve</string>

app-mini/src/main/res/values-id/strings.xml

@@ -115,8 +115,6 @@
   <string name="pref_torrc_title">Konfigurasi Torrc</string>
   <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string>
   <string name="pref_torrc_dialog">Torrc Custom</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Bridge Telah Diperbarui</string>

app-mini/src/main/res/values-in-rID/strings.xml

@@ -115,8 +115,6 @@
   <string name="pref_torrc_title">Konfigurasi Torrc</string>
   <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string>
   <string name="pref_torrc_dialog">Torrc Custom</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Bridge Telah Diperbarui</string>

app-mini/src/main/res/values-is/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Sérsniðnar stillingar Torrc</string>
   <string name="pref_torrc_summary">AÐEINS SÉRFRÆÐINGAR: sláðu inn stillingarlínur beint í torrc</string>
   <string name="pref_torrc_dialog">Sérsniðið Torrc</string>
-    <string name="kbps">kb/sek</string>
-  <string name="mbps">mb/sek</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Brýr uppfærðar</string>

app-mini/src/main/res/values-it/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Configurazioni personalizzate di Torrc</string>
   <string name="pref_torrc_summary">SOLO ESPERTI: inserisci direttamente configurazioni torrc</string>
   <string name="pref_torrc_dialog">Torrc personalizzate</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Bridge attivati</string>

app-mini/src/main/res/values-iw/strings.xml

@@ -94,8 +94,6 @@
   <string name="pref_transport_title">Tor TransProxy Port</string>
   <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string>
   <string name="pref_dnsport_title">Tor DNS Port</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="menu_qr">קוד QR</string>

app-mini/src/main/res/values-ja/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Torrc カスタム設定</string>
   <string name="pref_torrc_summary">上級者家のみ: 直接torrc設定行を入力します</string>
   <string name="pref_torrc_dialog">Torrcをカスタム</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">ブリッジを更新しました</string>

app-mini/src/main/res/values-ko/strings.xml

@@ -115,8 +115,6 @@
   <string name="pref_torrc_title">사용자 지정 Torrc 구성</string>
   <string name="pref_torrc_summary">전문가 전용: torrc 구성 줄을 직접 입력합니다</string>
   <string name="pref_torrc_dialog">나만의 Torrc</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">브릿지가 업데이트되었습니다</string>

app-mini/src/main/res/values-lv/strings.xml

@@ -115,8 +115,6 @@
   <string name="pref_torrc_title">Torrc pielāgota konfigurēšana</string>
   <string name="pref_torrc_summary">VIENĪGI EKSPERTIEM: tieši ievadīt torrc konfigurēšanas rindas</string>
   <string name="pref_torrc_dialog">Pielāgot Torrc</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Tilti ir atjaunināti</string>

app-mini/src/main/res/values-mk/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Прилагодено поставување на torrc</string>
   <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: внесете директни команди за поставување на torrc</string>
   <string name="pref_torrc_dialog">Прилагоден torrc</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Ажурирани мостови</string>

app-mini/src/main/res/values-nb/strings.xml

@@ -117,8 +117,6 @@
   <string name="pref_torrc_title">Egendefinert torrc-oppsett</string>
   <string name="pref_torrc_summary">BARE FOR EKSPERTER: skriv inn direkte torrc-oppsettslinjer</string>
   <string name="pref_torrc_dialog">Egendefinert torrc</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Broer oppdatert</string>

app-mini/src/main/res/values-nl/strings.xml

@@ -120,8 +120,6 @@
   <string name="pref_torrc_title">Torrc aangepaste configuratie</string>
   <string name="pref_torrc_summary">ENKEL VOOR GEVORDERDEN: voer rechtstreeks torrc-configuratieregels in</string>
   <string name="pref_torrc_dialog">Aangepaste Torrc</string>
-    <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
   <string name="bridges_updated">Bridges bijgewerkt</string>