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

guardianproject · Sep 9, 2020 · 2334ed0 · 2334ed0
2 parents c5b52f6 + 13d5746
commit 2334ed0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 290 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.project b/.project
diff --git a/.tx/config b/.tx/config
@@ -9,6 +9,13 @@ source_file = app/src/main/res/values/strings.xml
 source_lang = en
 type = ANDROID
 
+[orbot.servicexml]
+file_filter = orbotservice/src/main/res/values-<lang>/strings.xml
+host = https://www.transifex.com
+source_file = orbotservice/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+
 [orbot.poestringsxml]
 file_filter = app/src/main/res/values-<lang>/poestrings.xml
 host = https://www.transifex.com

diff --git a/add-proguard-release.xml b/add-proguard-release.xml
diff --git a/bcdroid.manifest b/bcdroid.manifest
diff --git a/build.xml b/build.xml
diff --git a/custom_rules.xml b/custom_rules.xml