tor-commits
Threads by month
- ----- 2025 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
April 2019
- 18 participants
- 3315 discussions
[tor-browser-build/master] Bug 29575: Configure Firefox Project to Use New TOPL Dependencies
by gk＠torproject.org 12 Apr '19
by gk＠torproject.org 12 Apr '19
12 Apr '19
commit e0c5b567242d1bbfaab5a7aaa8e1b76c992cceb2
Author: sisbell <shane.isbell(a)gmail.com>
Date: Sun Mar 10 01:34:37 2019 -0800
Bug 29575: Configure Firefox Project to Use New TOPL Dependencies
---
projects/firefox/android-dependencies.patch | 30 +++++++++++++++++++++++++++
projects/firefox/build | 8 ++++---
projects/firefox/config | 10 ++++++++-
projects/firefox/gradle-dependencies-list.txt | 10 +++++++--
projects/tor-browser/build.android | 10 +++++----
5 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/projects/firefox/android-dependencies.patch b/projects/firefox/android-dependencies.patch
new file mode 100644
index 0000000..429bf8d
--- /dev/null
+++ b/projects/firefox/android-dependencies.patch
@@ -0,0 +1,30 @@
+diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
+index c8380042d8a9..990fabe05a60 100644
+--- a/mobile/android/app/build.gradle
++++ b/mobile/android/app/build.gradle
+@@ -225,8 +225,10 @@ dependencies {
+ implementation "com.android.support:design:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
+ implementation "com.android.support:customtabs:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
+ implementation "com.android.support:palette-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
+- implementation files('orbotservice-release.aar')
++ implementation files('android-release.aar')
++ implementation files('universal-0.0.3.jar')
+ implementation files('jsocksAndroid-release.aar')
++ implementation files('service-release.aar')
+
+ if (mozconfig.substs.MOZ_NATIVE_DEVICES) {
+ implementation "com.android.support:mediarouter-v7:${mozconfig.substs.ANDROID_SUPPORT_LIBRARY_VERSION}"
+@@ -265,9 +267,10 @@ dependencies {
+ // Including the Robotium JAR directly can cause issues with dexing.
+ androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.5.4'
+
+- // Orbotservice
+- implementation 'org.torproject:tor-android-binary:0.3.4.9'
+- implementation 'com.jrummyapps:android-shell:1.0.1'
++ //tor-android-service
++ implementation 'net.freehaven.tor.control:jtorctl:0.2'
++ implementation 'org.slf4j:slf4j-api:1.7.25'
++ implementation 'org.slf4j:slf4j-android:1.7.25'
+ }
+
+ // TODO: (bug 1261486): This impl is not robust -
diff --git a/projects/firefox/build b/projects/firefox/build
index 9719c23..c070770 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -103,11 +103,13 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
# Move Gradle Repo to hard-coded location. This location is embedded in the file
# chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility
mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo
- # The download script assumes the artifact package name is the complete URL path.
- # In some cases this is incorrect, so copy those artifacts to the correct location
- cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo
# Move orbot files so they will be included in the apk during the build
cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app
+ cp $rootdir/[% c('input_files_by_name/topl') %]/* mobile/android/app
+ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* mobile/android/app
+ # Apply patches
+ patch -p1 < $rootdir/android-dependencies.patch
+
# Prepare building the multi-locale .apk including our own strings
mkdir -p /var/tmp/dist/locales
tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %]
diff --git a/projects/firefox/config b/projects/firefox/config
index 8cc3a2f..61d4dbd 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -24,7 +24,7 @@ var:
container:
use_container: 1
# this should be updated when the list of gradle dependencies is changed
- gradle_dependencies_version: 3
+ gradle_dependencies_version: 4
# used by projects/firefox-locale-bundle
l10n-changesets.json: '[% exec("cat mobile/locales/l10n-changesets.json") %]'
@@ -163,6 +163,14 @@ input_files:
- project: orbot
name: orbot
enable: '[% c("var/android") %]'
+ - project: tor-android-service
+ name: tor-android-service
+ enable: '[% c("var/android") %]'
+ - project: tor-onion-proxy-library
+ name: topl
+ enable: '[% c("var/android") %]'
+ - filename: android-dependencies.patch
+ enable: '[% c("var/android") %]'
- project: firefox-locale-bundle
name: firefox-locale-bundle
enable: '[% c("var/android") %]'
diff --git a/projects/firefox/gradle-dependencies-list.txt b/projects/firefox/gradle-dependencies-list.txt
index 46f12c8..627c438 100644
--- a/projects/firefox/gradle-dependencies-list.txt
+++ b/projects/firefox/gradle-dependencies-list.txt
@@ -7,14 +7,12 @@ cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://jcent
d46777ad3ea8bca73491b2e02fc85b3664486abf5314cc4dc6740908bd855330 | https://jcenter.bintray.com/com/google/android/apps/common/testing/accessib…
ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://maven.google.com/com/android/tools/external/com-intellij/intellij-c…
536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6…
-32c797717189ffd0dcc2fcb2e804ab5a0d0c8dfa78b2aa78037f61d4a572f62c | https://raw.githubusercontent.com/guardianproject/gpmaven/master/org/torpro…
2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://maven.google.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://maven.google.com/com/android/tools/analytics-library/protos/26.0.1/…
c3fb02564ca173e45548d7a91aca1efe341db11da2656199d559773e7ae15edf | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1…
ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://jcenter.bintray.com/org/apache/apache/13/apache-13.pom
8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://maven.google.com/com/android/databinding/baseLibrary/3.0.1/baseLibr…
c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar
-f09330e83f0e3a3f6648ee43a6814ee3a91df699adf7446d6f1f38e95e34cd88 | https://raw.githubusercontent.com/guardianproject/gpmaven/master/org/torpro…
8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.…
8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://maven.google.com/com/android/tools/build/builder-test-api/3.0.1/bui…
363cc83767b760d7a564d5301e09467e6d48fc1c1c1664b1e18c50815ce19076 | https://jcenter.bintray.com/com/google/guava/guava/20.0/guava-20.0.pom
@@ -366,3 +364,11 @@ e767a1248adb4843110457e839e504c2511649ee78f05a6a311ea7f23578894d | https://maven
cf5c43860b53ba5a95c19bc6525cc43d3488a6fe3df2f649c0099a613a0640e3 | https://jcenter.bintray.com/com/google/code/gson/gson-parent/2.8.2/gson-par…
9619e68f7eb36da3a28a60315f34320972badbad43749cc66712bb95b96a4ef3 | https://maven.google.com/com/android/support/support-annotations/23.4.0/sup…
bcb7ce66a9c629fa7c723a767b6430e1a383e8d4dd543d603dcb0ad1b855b8b2 | https://maven.google.com/com/android/support/animated-vector-drawable/23.4.…
+3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0…
+18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar
+fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.…
+ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0…
+bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.…
+7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom
+18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.…
+
diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android
index ffaf93d..7592c6b 100644
--- a/projects/tor-browser/build.android
+++ b/projects/tor-browser/build.android
@@ -13,16 +13,18 @@ mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b
zip -d $apk META-INF/\*
zip -r -X $apk $ext_dir
-
-zip -d $apk lib/armeabi/tor.so
+unzip $apk lib/*
+zip -d $apk lib/\*
[% IF c("var/android-x86") %]
- zip -d $apk lib/armeabi-v7a/tor.so
+ zip $apk lib/x86/*
[% END %]
[% IF c("var/android-armv7") %]
- zip -d $apk lib/x86/tor.so
+ zip $apk lib/armeabi-v7a/*
[% END %]
+rm -fR lib
+
# Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest
java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android
1
0
[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 12 Apr '19
by translation＠torproject.org 12 Apr '19
12 Apr '19
commit 8363e07b0185b69d54e949cf4444f560d3a6293e
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Apr 12 08:20:50 2019 +0000
Update translations for support-portal
---
contents+ar.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contents+ar.po b/contents+ar.po
index 6e952aa9d..25e2328f7 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -3,8 +3,8 @@
# Isho Antar <isho.antar1(a)gmail.com>, 2018
# erinm, 2019
# Ahmed A. <6622227a(a)gmail.com>, 2019
-# Emma Peel, 2019
# ButterflyOfFire ButterflyOfFire, 2019
+# Emma Peel, 2019
#
msgid ""
msgstr ""
@@ -12,7 +12,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-08 17:07+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
-"Last-Translator: ButterflyOfFire ButterflyOfFire, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
"Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1168,7 +1168,7 @@ msgstr ""
#: https//support.torproject.org/tbb/tbb-26/
#: (content/tbb/tbb-26/contents+en.lrquestion.title)
msgid "I'm having a problem with HTTPS Everywhere."
-msgstr ""
+msgstr "لدي مشكلة مع HTTPS في كل مكان."
#: https//support.torproject.org/tbb/tbb-26/
#: (content/tbb/tbb-26/contents+en.lrquestion.description)
1
0
[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 Apr '19
by translation＠torproject.org 12 Apr '19
12 Apr '19
commit d00c46416d442300eab4bb29c8d67fb6e1e8d991
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Apr 12 08:19:57 2019 +0000
Update translations for torcheck_completed
---
fr/torcheck.po | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/fr/torcheck.po b/fr/torcheck.po
index 35c26d73c..98f2e1f47 100644
--- a/fr/torcheck.po
+++ b/fr/torcheck.po
@@ -6,6 +6,7 @@
# AO <ao(a)localizationlab.org>, 2018-2019
# arpalord <inactive+arpalord(a)transifex.com>, 2012
# BitingBird <bitingbird(a)riseup.net>, 2014
+# Emma Peel, 2019
# fanjoe <fanjoe(a)netcourrier.com>, 2014
# AO <ao(a)localizationlab.org>, 2017-2018
# AO <ao(a)localizationlab.org>, 2016
@@ -13,14 +14,15 @@
# Maxime <maijin21(a)gmail.com>, 2013
# monsieurtino <monsieurtino(a)mailoo.org>, 2014-2015
# Onizuka, 2013
+# PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2019
# rike, 2014
# skhaen <skhaen(a)cyphercat.eu>, 2011
msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-04-08 06:05+0000\n"
-"Last-Translator: AO <ao(a)localizationlab.org>\n"
+"PO-Revision-Date: 2019-04-12 08:10+0000\n"
+"Last-Translator: PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -42,9 +44,9 @@ msgid "There is a security update available for Tor Browser."
msgstr "Une mise à jour de sécurité est proposée pour le Navigateur Tor."
msgid ""
-"<a href=\"https://www.torproject.org/download/download-easy.html\">Click "
-"here to go to the download page</a>"
-msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Cliquez ici pour aller sur la page de téléchargement</a>"
+"<a href=\"https://www.torproject.org/download/\">Click here to go to the "
+"download page</a>"
+msgstr "<a href=\"https://www.torproject.org/download/\">Cliquez ici pour aller sur la page de téléchargement</a>"
msgid "Sorry. You are not using Tor."
msgstr "Désolé. Vous n’utilisez pas Tor."
@@ -52,24 +54,16 @@ msgstr "Désolé. Vous n’utilisez pas Tor."
msgid ""
"If you are attempting to use a Tor client, please refer to the <a "
"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a"
-" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for "
-"configuring your Tor client</a>."
-msgstr "Si vous tentez d’utiliser un client Tor, veuillez vous référer au <a href=\"https://www.torproject.org/\">site Web de Tor</a> et plus particulièrement aux <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions pour configurer votre client Tor</a>."
+" href=\"https://support.torproject.org/#faq\">frequently asked "
+"questions</a>."
+msgstr "Si vous tentez d’utiliser un client Tor, veuillez vous référer au <a href=\"https://www.torproject.org/\">site Web de Tor</a> et plus particulièrement aux <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">a la foire aux questions</a>."
msgid "Sorry, your query failed or an unexpected response was received."
msgstr "Désolé, votre demande a échoué ou une réponse inattendue a été reçue."
-msgid ""
-"A temporary service outage prevents us from determining if your source IP "
-"address is a <a href=\"https://www.torproject.org/\">Tor</a> node."
-msgstr "Une interruption temporaire de service nous empêche de déterminer si votre adresse IP source est un nœud <a href=\"https://www.torproject.org/\">Tor</a>."
-
msgid "Your IP address appears to be: "
msgstr "Votre adresse IP semble être :"
-msgid "Are you using Tor?"
-msgstr "Êtes-vous en train d’utiliser Tor ?"
-
msgid "This page is also available in the following languages:"
msgstr "Cette page est également proposée dans les langues suivantes :"
@@ -87,9 +81,6 @@ msgstr "En apprendre davatange »"
msgid "Go"
msgstr "Aller"
-msgid "Short User Manual"
-msgstr "Petit guide d’utilisation"
-
msgid "Donate to Support Tor"
msgstr "Faire un don pour soutenir Tor"
@@ -113,3 +104,6 @@ msgstr "Faites fonctionner un relais"
msgid "Stay Anonymous"
msgstr "Restez anonyme"
+
+msgid "Relay Search"
+msgstr "Recherche de relais"
1
0
12 Apr '19
commit a41b51e1eb11ca4ccc35a18e66f40f1d827d8c9c
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Apr 12 08:19:51 2019 +0000
Update translations for torcheck
---
fr/torcheck.po | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/fr/torcheck.po b/fr/torcheck.po
index b96bb85fe..98f2e1f47 100644
--- a/fr/torcheck.po
+++ b/fr/torcheck.po
@@ -14,14 +14,15 @@
# Maxime <maijin21(a)gmail.com>, 2013
# monsieurtino <monsieurtino(a)mailoo.org>, 2014-2015
# Onizuka, 2013
+# PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2019
# rike, 2014
# skhaen <skhaen(a)cyphercat.eu>, 2011
msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2019-04-09 07:56+0000\n"
-"Last-Translator: Emma Peel\n"
+"PO-Revision-Date: 2019-04-12 08:10+0000\n"
+"Last-Translator: PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgid ""
"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a"
" href=\"https://support.torproject.org/#faq\">frequently asked "
"questions</a>."
-msgstr ""
+msgstr "Si vous tentez d’utiliser un client Tor, veuillez vous référer au <a href=\"https://www.torproject.org/\">site Web de Tor</a> et plus particulièrement aux <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">a la foire aux questions</a>."
msgid "Sorry, your query failed or an unexpected response was received."
msgstr "Désolé, votre demande a échoué ou une réponse inattendue a été reçue."
@@ -105,4 +106,4 @@ msgid "Stay Anonymous"
msgstr "Restez anonyme"
msgid "Relay Search"
-msgstr ""
+msgstr "Recherche de relais"
1
0
[translation/torbutton-browseronboardingproperties_completed] Update translations for torbutton-browseronboardingproperties_completed
by translation＠torproject.org 12 Apr '19
by translation＠torproject.org 12 Apr '19
12 Apr '19
commit fd37209cf7edbcc67d68bfe29d2a0e983431df2a
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Apr 12 08:19:35 2019 +0000
Update translations for torbutton-browseronboardingproperties_completed
---
fr/browserOnboarding.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fr/browserOnboarding.properties b/fr/browserOnboarding.properties
index e77b53b37..379a8fa2c 100644
--- a/fr/browserOnboarding.properties
+++ b/fr/browserOnboarding.properties
@@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Aller vers Sécurité
onboarding.tour-tor-security=Sécurité
onboarding.tour-tor-security.title=Choisissez votre expérience.
onboarding.tour-tor-security.description=Nous vous offrons aussi des paramètres supplémentaires pour augmenter la sécurité de votre navigateur. Nos paramètres de sécurité vous permettent de bloquer des éléments qui pourraient être utilisés pour attaquer votre ordinateur. Cliquez ci-dessous pour voir ce que les différentes options vous proposent.
-onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them.
+onboarding.tour-tor-security.description-suffix=Note : Par défaut, NoScript et HTTPS Everywhere ne sont inclus dans la barre d’outils, mais vous pouvez personnaliser votre barre d’outil pour les ajouter.
onboarding.tour-tor-security-level.button=Voir votre niveau de sécurité
onboarding.tour-tor-security-level.next-button=Aller vers Conseils sur l’expérience
1
0
[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 12 Apr '19
by translation＠torproject.org 12 Apr '19
12 Apr '19
commit 77cfdcdc95d6f20fee5e0b2838bf32bdd0379a02
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Apr 12 08:19:29 2019 +0000
Update translations for torbutton-browseronboardingproperties
---
fr/browserOnboarding.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fr/browserOnboarding.properties b/fr/browserOnboarding.properties
index e77b53b37..379a8fa2c 100644
--- a/fr/browserOnboarding.properties
+++ b/fr/browserOnboarding.properties
@@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Aller vers Sécurité
onboarding.tour-tor-security=Sécurité
onboarding.tour-tor-security.title=Choisissez votre expérience.
onboarding.tour-tor-security.description=Nous vous offrons aussi des paramètres supplémentaires pour augmenter la sécurité de votre navigateur. Nos paramètres de sécurité vous permettent de bloquer des éléments qui pourraient être utilisés pour attaquer votre ordinateur. Cliquez ci-dessous pour voir ce que les différentes options vous proposent.
-onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them.
+onboarding.tour-tor-security.description-suffix=Note : Par défaut, NoScript et HTTPS Everywhere ne sont inclus dans la barre d’outils, mais vous pouvez personnaliser votre barre d’outil pour les ajouter.
onboarding.tour-tor-security-level.button=Voir votre niveau de sécurité
onboarding.tour-tor-security-level.next-button=Aller vers Conseils sur l’expérience
1
0
12 Apr '19
commit aa321fb6bca0a5b9fffd6f92053100aad6ab2679
Author: sisbell <shane.isbell(a)gmail.com>
Date: Fri Apr 12 08:12:41 2019 +0000
Bug 29312: Create TBB Project for TOPL
---
projects/tor-onion-proxy-library/build | 26 +++
projects/tor-onion-proxy-library/config | 31 ++++
.../gradle-dependencies-list.txt | 201 +++++++++++++++++++++
projects/tor-onion-proxy-library/maven-repo.patch | 35 ++++
4 files changed, 293 insertions(+)
diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build
new file mode 100644
index 0000000..bc83108
--- /dev/null
+++ b/projects/tor-onion-proxy-library/build
@@ -0,0 +1,26 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+output_dir=[% dest_dir %]/[% c('filename') %]
+gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %]
+export GRADLE_MAVEN_REPO="file://$gradle_repo"
+
+# The download script assumes artifact package name is the complete URL path.
+# In some cases this is incorrect, so copy those artifacts to correct location
+cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo
+cp -r $gradle_repo/dl/android/maven2/* $gradle_repo
+cp -r $gradle_repo/maven2/* $gradle_repo
+
+mkdir -p /var/tmp/build $output_dir
+
+[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
+tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
+
+# Patch projects
+cd /var/tmp/build/[% project %]-[% c('version') %]
+patch -p1 < $rootdir/maven-repo.patch
+
+# Build Android Libraries and Apps
+$GRADLE_HOME/gradle-4.1/bin/gradle --offline -P androidplugin=3.0.1 assembleRelease -x lint
+
+# Package
+cp universal/build/libs/* android/build/outputs/aar/* $output_dir
diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config
new file mode 100644
index 0000000..eafaa67
--- /dev/null
+++ b/projects/tor-onion-proxy-library/config
@@ -0,0 +1,31 @@
+# vim: filetype=yaml sw=2
+version: '[% c("abbrev") %]'
+filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
+git_hash: be7206bba357bda11455b012bfcc0d42cc16c99d
+git_url: https://github.com/sisbell/Tor_Onion_Proxy_Library.git
+git_submodule: 1
+
+var:
+ deps:
+ - build-essential
+ - unzip
+ - zip
+ container:
+ use_container: 1
+ # this should be updated when the list of gradle dependencies is changed
+ gradle_dependencies_version: 1
+
+targets:
+ android:
+ var:
+ arch_deps:
+ - openjdk-8-jdk
+
+input_files:
+ - project: container-image
+ - name: '[% c("var/compiler") %]'
+ project: '[% c("var/compiler") %]'
+ - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
+ name: gradle-dependencies
+ exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
+ - filename: maven-repo.patch
diff --git a/projects/tor-onion-proxy-library/gradle-dependencies-list.txt b/projects/tor-onion-proxy-library/gradle-dependencies-list.txt
new file mode 100644
index 0000000..6c5b7f1
--- /dev/null
+++ b/projects/tor-onion-proxy-library/gradle-dependencies-list.txt
@@ -0,0 +1,201 @@
+# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt
+# Don't forget to update var/gradle_dependencies_version when modifying this file
+sha256sum | url
+c3c99bf58182889fe86315e9a01473ee2c95540b9dedef898cec64554d925c54 | https://repo1.maven.org/maven2/com/android/tools/annotations/24.5.0/annotat…
+58aa4df8faae90e484c0bc47494a1ec97dc51fe53eae2b4a70d60ea7489cdf8c | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-inte…
+47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://repo1.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1/j…
+c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar
+a20fb26c8de5b0ff7a3069e681fcf01ebefd2f3d24b832c3af22d981d7d4376b | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1…
+26e25982a0382633c9a2ad52da483bf44d06bed72e09b98cdce61e0780ebb928 | https://dl.google.com/dl/android/maven2/com/android/support/support-compat/…
+cf7e3630e1929ddeffcb0315db2acb37182c92dd3af970111b6115592f64d077 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.4.20150226212…
+2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d | https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations…
+ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.…
+cf251279505960889b6b281c26af0438656ebac3845e52791925cf7649cb15a6 | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdk…
+8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary…
+6f2ebfdaa5571ff614b002da3fac8f18cf9879dd4c5ea8144b55f87fce63c338 | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.1…
+81120db4d5490c4f0e9789e1178d2bac231fcff2618bd80f8ef6ff03c550d59b | https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.…
+e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a | https://repo1.maven.org/maven2/com/android/tools/build/transform-api/2.0.0-…
+74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c | https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.j…
+ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040 | https://repo1.maven.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar
+e899e02ec8ac6a73fb9c9c7cb9ebd9bfc4ce8263412285d5ec6f2df920880905 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mod…
+3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://repo1.maven.org/maven2/org/apache/httpcomponents/project/7/project-…
+e116f486c3554484c949b31fc93d3507f9701de7b379e45a0e0c1cf5099b2bbf | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector…
+18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://repo1.maven.org/maven2/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1…
+5d252585d47129cd667d96c92237383138a42edec5a8963a7dd44cd770faed91 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/…
+1151b7f0ea29c9a9a8fee042a1dbe82f196632d801c438d08b279e131c767118 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-…
+df5f5e4b6d2ddcde49ed5a4e7e3bf2cb7f87e0d9892e5b066f995c4d703b228f | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+99d6199ad5a09a0e5e8a49a4cc08f818483ddcfd7eedea2f9923412daf982309 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat…
+1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e | https://repo1.maven.org/maven2/com/google/guava/guava/22.0/guava-22.0.jar
+af83b06679ebe43ded35c9922c1db31b85c14f48892dd741460b7cb8aacd1673 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-…
+3369250d6893cde0feda0a97c3c70f79ad9d8b8a82f08a868997873b154cba71 | https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.…
+a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9 | https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.…
+e767a1248adb4843110457e839e504c2511649ee78f05a6a311ea7f23578894d | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-tes…
+f51550a06b1410bd4962cb0e71df0b921a60a7ef47bfa9c4825a14be72316eea | https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.14…
+2ba9c1cfec6b4a183b72a5ccc6cb2c83479d6ad7e931543c792292c1679a7f43 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetb…
+54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86 | https://repo1.maven.org/maven2/commons-codec/commons-codec/1.6/commons-code…
+6b5ad911a13a5c814c04be4376586eec15838158cb59b9f062ae138ddff1b861 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutl…
+d82e24e72c158315cec9f6efcb7a26851655bd987d705fc81699ff6710703ee4 | https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0…
+21bb4d44dff54e33a37c11af69859a714202ae00969aab5453eba7276688f8ec | https://repo1.maven.org/maven2/org/apache/httpcomponents/project/4.1.1/proj…
+85ec8258fafc283f61647e6a11b404890821c11db6fcf550779ecf7a14151007 | https://repo1.maven.org/maven2/org/ow2/asm/asm-parent/5.1/asm-parent-5.1.pom
+c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://repo1.maven.org/maven2/com/google/jimfs/jimfs-parent/1.1/jimfs-pare…
+cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://repo1.maven.org/maven2/com/google/google/1/google-1.pom
+f34b3a0b62cdb468eb7e8335de4edc87958dc299306c2b4ba8ea15e6a4be106a | https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/5.3.3/progua…
+7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://repo1.maven.org/maven2/com/googlecode/juniversalchardet/juniversalc…
+932e6bab9a24a7bc958bbdb7e29e04d083b473d11c4ba3fab1e9b7149579f272 | https://repo1.maven.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/pr…
+362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/h…
+401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://repo1.maven.org/maven2/org/antlr/antlr4-master/4.5.3/antlr4-master-…
+e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.2.5/htt…
+e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/com…
+f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://repo1.maven.org/maven2/com/intellij/annotations/12.0/annotations-12…
+cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581 | https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.jar
+cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4 | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_parent/2.0…
+ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.4.20150226212…
+e1abd7f1116cf5e0c59947693e2189208ec94296b2a3394c959e3511d399a7b0 | https://repo1.maven.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5…
+23e6d006f7d07bb43ebc80b2e530c8cdd65bbabcaaf911c3f12e2ea26167178c | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core…
+5215b648798c6c8d9b9cde3642d3bfb5a4cc894b7c8411004352e7de5d119827 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-cli…
+d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8 | https://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/common…
+86bf301a20ad0cd0a391e22a52e6fbf90575c096ff83233fa9fd0d52b3219121 | https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0…
+536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-…
+d49d179f707d3f3a00b2a7d36136b54aa8d44fa22770703cd82fe52fb39e22eb | https://repo1.maven.org/maven2/com/android/tools/build/transform-api/2.0.0-…
+ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0…
+953b116521a73575eee990e3f2c36a892fb088bb2d9a3027c82193cb7a013ef7 | https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.p…
+fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.p…
+f056ed61a281b3e230a63e4abf510c0d2f9bf7ff513cacb65a29538ba90ab177 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.build/0.7.4.2015022621…
+9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://repo1.maven.org/maven2/org/apache/apache/16/apache-16.pom
+b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.2.5/htt…
+4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd | https://repo1.maven.org/maven2/org/apache/apache/9/apache-9.pom
+13c1448f7ebb61f67e6fbd6cd5c188804c17c4d7e77c4b79b316ede4ef9cd9b3 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/…
+7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.…
+467ae650442e876867379094e7518dfdd67d22c5352ebd39808c84259e9790ba | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/25/commons…
+36d8385de1be7791231acb933b757198f97cb53bc7d046e8c4bc403d214caaca | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.1…
+9466512cd8cf0bd66a8a3661685373f7b3deafded11096e044926ff5c82c7a4c | https://repo1.maven.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.jar
+45eb0d6e49430271b5fb385c53fae0b81d6ad3eae465a7a8d948217bcae1e86d | https://repo1.maven.org/maven2/com/android/tools/external/lombok/lombok-ast…
+5fe8a11e913086fb7ab505b930987f30cfa3f4b226d4bbbc68003ca4387ae40e | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.…
+e6531a278b4f632f198a6e45b9e11de1b2b678cd5a4e0fdff442f604c2439a42 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262…
+7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262…
+8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-tes…
+8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://repo1.maven.org/maven2/com/android/tools/external/lombok/lombok-ast…
+963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-…
+feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305…
+8a4e4b32eedaa72976a757e12cf1dfe742725db0b7311bf176dd937ba4236384 | https://repo1.maven.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
+fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0 | https://repo1.maven.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5…
+b787d574c851505e76212968b9ae1641ea79804aef7f5a2cee2a01cd4055213a | https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.12/com…
+52b6fd2eaf2240e14dbe752f1fa884270cc668d6f350e8e7f65f6033a8172d69 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-cli…
+31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685 | https://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.pom
+10107898991129eff2042a41b1bfc2d72c4ea8e4babe429ae3aeb32c69c568de | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+a1e7d6b3efc1703c7c8f1b15ecf8757f17d0ac41f32c9a48481a5caf638c55db | https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.0.0/prot…
+aeb197158a2fb6bd2cb9233e22874f8051f82891dbd82b6b089f49e309f82e40 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/…
+a9d65daccc5afca97372936246ac49fb587423e005606e7981b0efc66b0e9385 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.…
+9d8cee7cd40eff22ebdeb90c8e70f5ee96c5bd25cb2c3e3b3940e27285a3e98a | https://dl.google.com/dl/android/maven2/com/android/support/support-media-c…
+b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.p…
+6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://repo1.maven.org/maven2/org/codehaus/codehaus-parent/4/codehaus-pare…
+f0c98c571e93a7cb4dd18df0fa308f0963e7a0620ac2d4244e61e709d03ad6be | https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2o…
+a47c950c755747ca3093a05e9ec85d0e2f33cbd224909f571fe7577963a4d799 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/…
+26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://repo1.maven.org/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simp…
+a2aaabe14b7c88dc55ce9b07b8a7bff5bc6c6d729cb404f591bdd3d6b4d7035e | https://dl.google.com/dl/android/maven2/android/arch/core/common/1.0.0/comm…
+d5905aee3c8a4ac75e069a73b914c0a41b9b36b0e6b04126719fca22659d3cc8 | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector…
+ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f | https://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/common…
+668eb6aeb3d038267e719deb55f38a4233a12602afb97e89da609c095394400a | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.…
+f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar
+905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed | https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305…
+1a56992fc50f838fd091b6b9701b30da64b00bd2fe76ad2c800212eb459b49e2 | https://repo1.maven.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.pom
+8bd632c00bdf80a7de36c22b60f12452c147d8eca2f00d79d66699ebe7daa02a | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/5/commons-…
+07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.…
+fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.…
+e4c7afb8f0d7aa159318d42a011cc2c9b0525d820973cbca5318bec6c649cecc | https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.0.0/prot…
+18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.…
+5a12ac3f190fc2cfab73435d859511220b13eb38f8784a530d06395969cf8c59 | https://raw.githubusercontent.com/guardianproject/gpmaven/master/org/torpro…
+81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.…
+2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://repo1.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1/j…
+31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.1/httpm…
+51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb | https://repo1.maven.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
+757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://repo1.maven.org/maven2/com/googlecode/juniversalchardet/juniversalc…
+7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://repo1.maven.org/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simp…
+63b465cc628f8c305702b12b26501cea236a3175db15b5a7356e98484aa63db5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mod…
+177603e3dce43e843799fe0284f8afe8121bb0cdbcdd34cd06bc09f7bd3e6c6f | https://raw.githubusercontent.com/guardianproject/gpmaven/master/org/torpro…
+fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/22/commons…
+0c0e9d1857c250d1d71b5c6be7b8cc29afe55e7419a90d13bbe968ae5bd7240e | https://repo1.maven.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
+1eaf9182e1977c1c50a70edbfbf70536398c68990bfaafc9f0e9899041201539 | https://repo1.maven.org/maven2/com/google/guava/guava-parent/22.0/guava-par…
+0277ea358292b25721c5edbae66c6a0b557b25497877d1aae5f2cac2bf6b3e6a | https://dl.google.com/dl/android/maven2/com/android/support/support-fragmen…
+7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca | https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-…
+0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core…
+f2885288839f82f824a0c042922ae7f24ed0d55ce26a74b6a7c557e0b7e30c24 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/k…
+f26bdec2b9496470c0ce63b0d290816e8000ef018daaa259597ebae947fd690f | https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/5.3.3/progua…
+9cddda75f4a1b4469e73f44e7b61a3e897d0f657df4797f9106ffe88c4eeade0 | https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-…
+6895e368fa59168428c78cdf300bb29352073f397d8f260af3de82df2c8b2448 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+9d44e7bf343dfd19a55e3e6f4c4e733b68d32509e0b0af5b32f2981f4f1dedd8 | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/26…
+712d7c974d20b71ce730938a3dda8d23e87cfd16500e1c1a2c9ecc2c9ff0d323 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.…
+e7a7a5810829dee924cec654a569a48301fcedd487f7b88710e816d127385f51 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+7d6da01cf9766b1705c6c80cfc12274a895b406c4c287900b07a56145ca6c030 | https://dl.google.com/dl/android/maven2/com/android/support/support-compat/…
+ecd46dc69f5212b35eb21d64db68072f956c000083030ff53e09d1f81487c580 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetb…
+2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvli…
+e4e34e5d02bd102e8d39ddbc29f9ead8a15a61e367993d02238196ac48509ad8 | https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.…
+1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
+a9660f8b64b74f474226c70a50187d8efcac448d32ce97756f408975aa52cdaa | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1…
+0ee5f691cbbedb69969b48374d27412f821959af5d2dffbabc424b607cdbbdf6 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/…
+e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCom…
+cd36b31f1495f4fe55a936dd00607abdd945e1f8074549225a04c402d1d35750 | https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.…
+1879f19a05991e3ed95910b96689333396b0c467a215dc4d1f90018404b72a26 | https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations…
+d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54 | https://repo1.maven.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.jar
+f8fd874c37c89d5dfe5ec8190d94626512bd36ab2c2ac9d4b67515c5bee745cb | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/k…
+2a0475c2625fc27f80d3c5021130509b4068e0f984f2511e7a77a097de48b41d | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdk…
+ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://repo1.maven.org/maven2/org/jetbrains/annotations/13.0/annotations-1…
+efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://repo1.maven.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
+87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7 | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/39/commons…
+803be394edb8dd7d1e678683ed85aee7f86a172c90f03e6198c8a49d4f342b99 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0…
+965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://repo1.maven.org/maven2/org/jetbrains/annotations/13.0/annotations-1…
+70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvli…
+c9a55463942128f0b7fad62b8bee5886d1cb1c733fb3b78507465b025e6a4031 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCom…
+ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://repo1.maven.org/maven2/org/apache/apache/13/apache-13.pom
+6f52ba933a117bd67131b281214510ea30232b9807bfe569bc0c17e6a2d4018c | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1…
+2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6 | https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.12/com…
+4fda6d4eb430971e3b1dad7456988333f374b0f4ba15f99839ca1a0ab5155c8a | https://dl.google.com/dl/android/maven2/com/android/support/support-core-ut…
+4f88a89142c64bf03906f84609594666e9694df56e3e6f05edfab8a68b39d837 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.…
+c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://repo1.maven.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
+f5a0a1eeaa100ed36aa83eca562d5dbb7e9b045c98b44db7da4745e9d9a20328 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/h…
+fb5369fc7ea4b2e3cf8d6f20243f1d97f81341bf818b179cd8dbd1da7a781a21 | https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom
+38db692b5cbaf69d89b1fe5b0fc38a5cc83f898716f8bc64086fa17c25ea57d6 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-…
+97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be | https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.…
+ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-inte…
+052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-me…
+3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c | https://repo1.maven.org/maven2/org/codehaus/mojo/mojo-parent/34/mojo-parent…
+3eae72fcf02a175efa1377886e6500e6147f92104ff43ee92b9b69d59357b90d | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat…
+b2b5dd46cf998fa626eb6f8a1c114f6167c8d392694164e62533e5898e9b31f2 | https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
+321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-…
+db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.1/httpm…
+1d2e883717b8ab7d3fcc9fa01034d165809a9c94daa6303a838f11e4d36adc86 | https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/5.3.3/proguard…
+0288414509c625b8dd544384fbd29f502bdc8b4f86cfc26625aa23eef9fa6057 | https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/5.3.3/progua…
+e51efb2ec140b2849b9880fb161cb6e30dd672368a534c1f47ab46d7f537d9ca | https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/5.3.3/proguard…
+b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/com…
+24633fb1e62a9e4b1a25e2c1751d68be89e050b488652456e545b8019539137d | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/…
+a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://repo1.maven.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar
+bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-me…
+eeafc0b2f5ffce9cfd848f4f7f66a927d402ba83961b12f00457fcf7806eac8f | https://dl.google.com/dl/android/maven2/com/android/support/support-media-c…
+bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://repo1.maven.org/maven2/org/slf4j/slf4j-android/1.7.25/slf4j-android…
+7e8bdca281bdcb6dad48a80854837f1c0ab46f31a0b292370e320f471f5b9cfd | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1…
+1f8c906d0de98ddfa81b1ce520ee52fbd280c222383b66cba89e16eafb626001 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary…
+ec3997c0fe3d424c0659e3202edc348f757e9c0bec329500326176e2146484d3 | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/26…
+a06e35d3fff3a6b813d94894ebf3e498f9540c864c5b39ae783907e3a6c72889 | https://repo1.maven.org/maven2/commons-codec/commons-codec/1.6/commons-code…
+5192934cd73df32e2c15722ed7fc488dde90baaec9ae030010dd1a80fb4e74e1 | https://dl.google.com/dl/android/maven2/android/arch/core/common/1.0.0/comm…
+164e7a9cf23a4e63bbc961f8db7d965d53d685710660a88249641f91d36f83a4 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-cor…
+7c3cd1581b573d3c88797f4d48312d171e6e24881f064271f19d3ef1c9b480d0 | https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui…
+8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6 | https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2o…
+bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://repo1.maven.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
+3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0…
+949246020c08a0543389082af38268cdce4ee7a7a8218097369b9845752866cb | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/…
+6d079b5abf39f323baaccc68463beef5cf2e9574f333dd749ae96753f00eb205 | https://repo1.maven.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.pom
+82f538051599335ea881ec264407547cab52be750f16ce099cfb27754fc755ff | https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui…
+5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
+9144127192d6f612c2366825dceaeb23b0d53130b83e0bf1ffe107d1470a8487 | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotation…
+e2b4935e76d91b5abec44de309f2c8bb8d1d2e6cc0b8790b43cb654f1e22c722 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutl…
+fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://repo1.maven.org/maven2/org/slf4j/slf4j-android/1.7.25/slf4j-android…
+9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194 | https://repo1.maven.org/maven2/org/apache/apache/4/apache-4.pom
+1ef71c25a9d46ae0ce023d02a5734e0b06fdf934fbc5948e20482526b22b4179 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.…
+e2f7b17610f9f0a2b55c019b7627be3d42ec142fde1db5caf8a34dbe3bb8dbcd | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/…
+5dc327c690d031a11aa8f9f4cdc391fb938fbb7c7c143cc4bc60dd573d1fd1c9 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0…
+a0ab3369ef40fe199160692f0463a5f63f1277ebfb64dd587c76fdb128d76b32 | https://dl.google.com/dl/android/maven2/com/android/support/support-fragmen…
+faf82de0dc02e0c0ae327cd653f37255496b2e53fce280b3ab4cb34553a89086 | https://repo1.maven.org/maven2/com/intellij/annotations/12.0/annotations-12…
+cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotation…
+a824b7efa9f6e66378e39d3eb79b8857ce6955663e4186ca6b2ad852eea64743 | https://dl.google.com/dl/android/maven2/com/android/support/support-core-ut…
diff --git a/projects/tor-onion-proxy-library/maven-repo.patch b/projects/tor-onion-proxy-library/maven-repo.patch
new file mode 100644
index 0000000..7062f8b
--- /dev/null
+++ b/projects/tor-onion-proxy-library/maven-repo.patch
@@ -0,0 +1,35 @@
+diff --git a/android/build.gradle b/android/build.gradle
+index 1549581..ab919cf 100644
+--- a/android/build.gradle
++++ b/android/build.gradle
+@@ -8,6 +8,7 @@ buildscript {
+ mavenCentral()
+ google()
+ jcenter()
++ maven { url System.getenv("GRADLE_MAVEN_REPO") }
+ }
+ dependencies {
+ classpath "com.android.tools.build:gradle:${androidplugin}"
+diff --git a/android_tor_installer/build.gradle b/android_tor_installer/build.gradle
+index d2c02cf..d846254 100644
+--- a/android_tor_installer/build.gradle
++++ b/android_tor_installer/build.gradle
+@@ -8,6 +8,7 @@ buildscript {
+ mavenCentral()
+ google()
+ jcenter()
++ maven { url System.getenv("GRADLE_MAVEN_REPO") }
+ }
+ dependencies {
+ classpath "com.android.tools.build:gradle:${androidplugin}"
+diff --git a/build.gradle b/build.gradle
+index 43b9e13..8087ab7 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -9,6 +9,7 @@ subprojects {
+ mavenLocal()
+ mavenCentral()
+ jcenter()
++ maven { url System.getenv("GRADLE_MAVEN_REPO") }
+ }
+ }
1
0
[tor-browser-build/master] Bug 29313: Create TBB Project for tor-android-service
by gk＠torproject.org 12 Apr '19
by gk＠torproject.org 12 Apr '19
12 Apr '19
commit 63d8e8c21b1001eba9e37cfc90e8b83d5e605723
Author: sisbell <shane.isbell(a)gmail.com>
Date: Sun Feb 24 15:11:19 2019 -0800
Bug 29313: Create TBB Project for tor-android-service
---
projects/tor-android-service/build | 33 ++++
projects/tor-android-service/config | 33 ++++
.../tor-android-service/content-provider.patch | 13 ++
.../gradle-dependencies-list.txt | 183 +++++++++++++++++++++
projects/tor-android-service/gradle.patch | 38 +++++
projects/tor-android-service/require-api.patch | 28 ++++
6 files changed, 328 insertions(+)
diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build
new file mode 100644
index 0000000..65bac4e
--- /dev/null
+++ b/projects/tor-android-service/build
@@ -0,0 +1,33 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+output_dir=[% dest_dir %]/[% c('filename') %]
+gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %]
+export GRADLE_MAVEN_REPO="file://$gradle_repo"
+
+# The download script assumes artifact package name is the complete URL path.
+# In some cases this is incorrect, so copy those artifacts to correct location
+cp -r $gradle_repo/dl/android/maven2/* $gradle_repo
+
+mkdir -p /var/tmp/build $output_dir
+
+[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
+tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
+
+# Patch projects
+cd /var/tmp/build/[% project %]-[% c('version') %]
+patch -p1 < $rootdir/gradle.patch
+patch -p1 < $rootdir/content-provider.patch
+patch -p1 < $rootdir/require-api.patch
+
+# Remove native files, otherwise build will fail after gradle.patch
+rm -fR service/src/main/jni
+
+# Replace libraries with the config dependencies
+rm service/libs/*
+cp $rootdir/[% c('input_files_by_name/topl') %]/*{.aar,.jar} service/libs/
+
+# Build Android Libraries and Apps
+$GRADLE_HOME/gradle-4.1/bin/gradle --offline -P androidplugin=3.0.1 -P appcompatVersion=23.4.0 -P compileVersion=26 -P targetVersion=26 -P minVersion=16 assembleRelease -x lint
+
+# Package
+cp jsocksAndroid/build/outputs/aar/* service/build/outputs/aar/* $output_dir
diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config
new file mode 100644
index 0000000..ab6eb6c
--- /dev/null
+++ b/projects/tor-android-service/config
@@ -0,0 +1,33 @@
+# vim: filetype=yaml sw=2
+version: '[% c("abbrev") %]'
+filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
+git_hash: 6a9314aff4418a4edac33ff39fae266b097cf000
+git_url: https://github.com/sisbell/tor-android-service.git
+git_submodule: 1
+
+var:
+ deps:
+ - build-essential
+ container:
+ use_container: 1
+ # this should be updated when the list of gradle dependencies is changed
+ gradle_dependencies_version: 1
+
+targets:
+ android:
+ var:
+ arch_deps:
+ - openjdk-8-jdk
+
+input_files:
+ - project: container-image
+ - name: '[% c("var/compiler") %]'
+ project: '[% c("var/compiler") %]'
+ - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
+ name: gradle-dependencies
+ exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
+ - filename: gradle.patch
+ - filename: content-provider.patch
+ - filename: require-api.patch
+ - project: tor-onion-proxy-library
+ name: topl
diff --git a/projects/tor-android-service/content-provider.patch b/projects/tor-android-service/content-provider.patch
new file mode 100644
index 0000000..b026728
--- /dev/null
+++ b/projects/tor-android-service/content-provider.patch
@@ -0,0 +1,13 @@
+diff --git a/service/src/main/java/org/torproject/android/service/DataService.java b/service/src/main/java/org/torproject/android/service/DataService.java
+index 8f802ea..07e52f3 100644
+--- a/service/src/main/java/org/torproject/android/service/DataService.java
++++ b/service/src/main/java/org/torproject/android/service/DataService.java
+@@ -28,7 +28,7 @@ final class DataService {
+ this.torService = torService;
+ this.eventBroadcaster = eventBroadcaster;
+ this.torConfig = torConfig;
+- String packageName = context.getApplicationInfo().packageName;
++ String packageName = "org.torproject.torbrowser";
+ COOKIE_CONTENT_URI = Uri.parse("content://" + packageName + ".ui.hiddenservices.providers.cookie/cookie");
+ HS_CONTENT_URI = Uri.parse("content://" + packageName + ".ui.hiddenservices.providers/hs");
+ }
diff --git a/projects/tor-android-service/gradle-dependencies-list.txt b/projects/tor-android-service/gradle-dependencies-list.txt
new file mode 100644
index 0000000..f07715d
--- /dev/null
+++ b/projects/tor-android-service/gradle-dependencies-list.txt
@@ -0,0 +1,183 @@
+# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt
+# Don't forget to update var/gradle_dependencies_version when modifying this file
+sha256sum | url
+f0c98c571e93a7cb4dd18df0fa308f0963e7a0620ac2d4244e61e709d03ad6be | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc…
+965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0…
+3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://jcenter.bintray.com/org/apache/httpcomponents/project/7/project-7.p…
+31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime…
+905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.…
+bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.…
+58aa4df8faae90e484c0bc47494a1ec97dc51fe53eae2b4a70d60ea7489cdf8c | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-inte…
+2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6 | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common…
+467ae650442e876867379094e7518dfdd67d22c5352ebd39808c84259e9790ba | https://jcenter.bintray.com/org/apache/commons/commons-parent/25/commons-pa…
+2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.…
+c3c99bf58182889fe86315e9a01473ee2c95540b9dedef898cec64554d925c54 | https://jcenter.bintray.com/com/android/tools/annotations/24.5.0/annotation…
+1eaf9182e1977c1c50a70edbfbf70536398c68990bfaafc9f0e9899041201539 | https://jcenter.bintray.com/com/google/guava/guava-parent/22.0/guava-parent…
+43edcc0fc3bd8520bf60066f54088f272e39aa856d25cdd6ca9ee4d8f5c32666 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-…
+a9d65daccc5afca97372936246ac49fb587423e005606e7981b0efc66b0e9385 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.…
+bcb7ce66a9c629fa7c723a767b6430e1a383e8d4dd543d603dcb0ad1b855b8b2 | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector…
+cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2…
+e4c7afb8f0d7aa159318d42a011cc2c9b0525d820973cbca5318bec6c649cecc | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu…
+45eb0d6e49430271b5fb385c53fae0b81d6ad3eae465a7a8d948217bcae1e86d | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.…
+ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0…
+963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk…
+f8fd874c37c89d5dfe5ec8190d94626512bd36ab2c2ac9d4b67515c5bee745cb | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotl…
+cf7e3630e1929ddeffcb0315db2acb37182c92dd3af970111b6115592f64d077 | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o…
+a20fb26c8de5b0ff7a3069e681fcf01ebefd2f3d24b832c3af22d981d7d4376b | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1…
+85ec8258fafc283f61647e6a11b404890821c11db6fcf550779ecf7a14151007 | https://jcenter.bintray.com/org/ow2/asm/asm-parent/5.1/asm-parent-5.1.pom
+7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-…
+40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc…
+ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o…
+9cddda75f4a1b4469e73f44e7b61a3e897d0f657df4797f9106ffe88c4eeade0 | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6…
+81120db4d5490c4f0e9789e1178d2bac231fcff2618bd80f8ef6ff03c550d59b | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.p…
+df5f5e4b6d2ddcde49ed5a4e7e3bf2cb7f87e0d9892e5b066f995c4d703b228f | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://jcenter.bintray.com/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-…
+6895e368fa59168428c78cdf300bb29352073f397d8f260af3de82df2c8b2448 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.…
+23e6d006f7d07bb43ebc80b2e530c8cdd65bbabcaaf911c3f12e2ea26167178c | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core…
+1ef71c25a9d46ae0ce023d02a5734e0b06fdf934fbc5948e20482526b22b4179 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.…
+2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json…
+b2b5dd46cf998fa626eb6f8a1c114f6167c8d392694164e62533e5898e9b31f2 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.pom
+f51550a06b1410bd4962cb0e71df0b921a60a7ef47bfa9c4825a14be72316eea | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-parent/1.14/an…
+87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7 | https://jcenter.bintray.com/org/apache/commons/commons-parent/39/commons-pa…
+aeb197158a2fb6bd2cb9233e22874f8051f82891dbd82b6b089f49e309f82e40 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/…
+54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1…
+ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l…
+668eb6aeb3d038267e719deb55f38a4233a12602afb97e89da609c095394400a | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.…
+5215b648798c6c8d9b9cde3642d3bfb5a4cc894b7c8411004352e7de5d119827 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client…
+9144127192d6f612c2366825dceaeb23b0d53130b83e0bf1ffe107d1470a8487 | https://jcenter.bintray.com/com/google/errorprone/error_prone_annotations/2…
+b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco…
+d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.jar
+81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.…
+757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar…
+0ee5f691cbbedb69969b48374d27412f821959af5d2dffbabc424b607cdbbdf6 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kot…
+536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6…
+cd36b31f1495f4fe55a936dd00607abdd945e1f8074549225a04c402d1d35750 | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
+fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.…
+6d079b5abf39f323baaccc68463beef5cf2e9574f333dd749ae96753f00eb205 | https://jcenter.bintray.com/org/ow2/asm/asm/5.1/asm-5.1.pom
+8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary…
+e1abd7f1116cf5e0c59947693e2189208ec94296b2a3394c959e3511d399a7b0 | https://jcenter.bintray.com/com/squareup/javawriter/2.5.0/javawriter-2.5.0.…
+9619e68f7eb36da3a28a60315f34320972badbad43749cc66712bb95b96a4ef3 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat…
+5d252585d47129cd667d96c92237383138a42edec5a8963a7dd44cd770faed91 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/…
+3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0…
+f34b3a0b62cdb468eb7e8335de4edc87958dc299306c2b4ba8ea15e6a4be106a | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-…
+e899e02ec8ac6a73fb9c9c7cb9ebd9bfc4ce8263412285d5ec6f2df920880905 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mod…
+2a0475c2625fc27f80d3c5021130509b4068e0f984f2511e7a77a097de48b41d | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdk…
+e91a88dd0c5e99069b7f09d4a46b5e06f1e9c4c72fc0a8e987e25d86af480f01 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat…
+4f88a89142c64bf03906f84609594666e9694df56e3e6f05edfab8a68b39d837 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.…
+1f8c906d0de98ddfa81b1ce520ee52fbd280c222383b66cba89e16eafb626001 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary…
+401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://jcenter.bintray.com/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5…
+1a56992fc50f838fd091b6b9701b30da64b00bd2fe76ad2c800212eb459b49e2 | https://jcenter.bintray.com/com/google/code/gson/gson/2.3/gson-2.3.pom
+803be394edb8dd7d1e678683ed85aee7f86a172c90f03e6198c8a49d4f342b99 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0…
+feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.…
+d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8 | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l…
+1d2e883717b8ab7d3fcc9fa01034d165809a9c94daa6303a838f11e4d36adc86 | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba…
+7e8bdca281bdcb6dad48a80854837f1c0ab46f31a0b292370e320f471f5b9cfd | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1…
+d7e368746fa68ca6ba63519fb0838be9a278d509a5fcee6cd4a778a119eae447 | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/23…
+7c62f3856e8abca1d79257925f26c12668693f5d95904056bbac88605cfd8575 | https://dl.google.com/dl/android/maven2/com/android/tools/build/transform-a…
+1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.jar
+a1e7d6b3efc1703c7c8f1b15ecf8757f17d0ac41f32c9a48481a5caf638c55db | https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobu…
+3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c | https://jcenter.bintray.com/org/codehaus/mojo/mojo-parent/34/mojo-parent-34…
+712d7c974d20b71ce730938a3dda8d23e87cfd16500e1c1a2c9ecc2c9ff0d323 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.…
+7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom
+4de4a3d05e1c534c2db9e4588bf34082bb2bd232d8abb9727c430290ce225740 | https://dl.google.com/dl/android/maven2/com/android/tools/build/transform-a…
+e7a7a5810829dee924cec654a569a48301fcedd487f7b88710e816d127385f51 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+e336a35a1e102c2f11ce1ea7f0872df14e332374b8eacc0877e50f85f84c3d09 | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector…
+63b465cc628f8c305702b12b26501cea236a3175db15b5a7356e98484aa63db5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mod…
+7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128…
+164e7a9cf23a4e63bbc961f8db7d965d53d685710660a88249641f91d36f83a4 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-core/4…
+ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-inte…
+cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581 | https://jcenter.bintray.com/commons-io/commons-io/2.4/commons-io-2.4.jar
+51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb | https://jcenter.bintray.com/org/ow2/ow2/1.3/ow2-1.3.pom
+e2f7b17610f9f0a2b55c019b7627be3d42ec142fde1db5caf8a34dbe3bb8dbcd | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/…
+5fe8a11e913086fb7ab505b930987f30cfa3f4b226d4bbbc68003ca4387ae40e | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.…
+a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9 | https://jcenter.bintray.com/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.j…
+4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd | https://jcenter.bintray.com/org/apache/apache/9/apache-9.pom
+150021a89ae6f252415cbfff5c3111bf87433776b997b68e6e71f37e5b696799 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-…
+b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
+0288414509c625b8dd544384fbd29f502bdc8b4f86cfc26625aa23eef9fa6057 | https://jcenter.bintray.com/net/sf/proguard/proguard-parent/5.3.3/proguard-…
+70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvli…
+faf82de0dc02e0c0ae327cd653f37255496b2e53fce280b3ab4cb34553a89086 | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.…
+bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-me…
+8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk…
+0c0e9d1857c250d1d71b5c6be7b8cc29afe55e7419a90d13bbe968ae5bd7240e | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
+052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-me…
+e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco…
+0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core…
+07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.…
+e767a1248adb4843110457e839e504c2511649ee78f05a6a311ea7f23578894d | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-tes…
+18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar
+953b116521a73575eee990e3f2c36a892fb088bb2d9a3027c82193cb7a013ef7 | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom
+9466512cd8cf0bd66a8a3661685373f7b3deafded11096e044926ff5c82c7a4c | https://jcenter.bintray.com/com/google/code/gson/gson/2.3/gson-2.3.jar
+fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb | https://jcenter.bintray.com/org/apache/commons/commons-parent/22/commons-pa…
+ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.…
+7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchar…
+6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://jcenter.bintray.com/org/codehaus/codehaus-parent/4/codehaus-parent-…
+ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://jcenter.bintray.com/org/apache/apache/13/apache-13.pom
+f2885288839f82f824a0c042922ae7f24ed0d55ce26a74b6a7c557e0b7e30c24 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotl…
+fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.…
+cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4 | https://jcenter.bintray.com/com/google/errorprone/error_prone_parent/2.0.18…
+cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://jcenter.bintray.com/com/google/google/1/google-1.pom
+97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar
+a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar
+efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
+d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/23…
+1879f19a05991e3ed95910b96689333396b0c467a215dc4d1f90018404b72a26 | https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.…
+949246020c08a0543389082af38268cdce4ee7a7a8218097369b9845752866cb | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/…
+a47c950c755747ca3093a05e9ec85d0e2f33cbd224909f571fe7577963a4d799 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kot…
+1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
+db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime…
+ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040 | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar
+b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/com…
+ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0…
+ecd46dc69f5212b35eb21d64db68072f956c000083030ff53e09d1f81487c580 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetb…
+8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.…
+10107898991129eff2042a41b1bfc2d72c4ea8e4babe429ae3aeb32c69c568de | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://jcenter.bintray.com/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-…
+7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk…
+f5a0a1eeaa100ed36aa83eca562d5dbb7e9b045c98b44db7da4745e9d9a20328 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http…
+2ba9c1cfec6b4a183b72a5ccc6cb2c83479d6ad7e931543c792292c1679a7f43 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetb…
+8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json…
+a0d002465c0f611eedaaef2b2530707d2e9fb3a5c7ed66f53c556a12f714f43a | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/23.4…
+e6531a278b4f632f198a6e45b9e11de1b2b678cd5a4e0fdff442f604c2439a42 | https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.4.201502262128…
+c9a55463942128f0b7fad62b8bee5886d1cb1c733fb3b78507465b025e6a4031 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCom…
+e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/com…
+31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.pom
+38db692b5cbaf69d89b1fe5b0fc38a5cc83f898716f8bc64086fa17c25ea57d6 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library…
+5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-…
+f26bdec2b9496470c0ce63b0d290816e8000ef018daaa259597ebae947fd690f | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-…
+5dc327c690d031a11aa8f9f4cdc391fb938fbb7c7c143cc4bc60dd573d1fd1c9 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0…
+e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCom…
+362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http…
+8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-tes…
+f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://jcenter.bintray.com/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar
+f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0.…
+a9660f8b64b74f474226c70a50187d8efcac448d32ce97756f408975aa52cdaa | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1…
+a06e35d3fff3a6b813d94894ebf3e498f9540c864c5b39ae783907e3a6c72889 | https://jcenter.bintray.com/commons-codec/commons-codec/1.6/commons-codec-1…
+8a4e4b32eedaa72976a757e12cf1dfe742725db0b7311bf176dd937ba4236384 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
+fb5369fc7ea4b2e3cf8d6f20243f1d97f81341bf818b179cd8dbd1da7a781a21 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom
+6f52ba933a117bd67131b281214510ea30232b9807bfe569bc0c17e6a2d4018c | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1…
+9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://jcenter.bintray.com/org/apache/apache/16/apache-16.pom
+e51efb2ec140b2849b9880fb161cb6e30dd672368a534c1f47ab46d7f537d9ca | https://jcenter.bintray.com/net/sf/proguard/proguard-base/5.3.3/proguard-ba…
+2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvli…
+24633fb1e62a9e4b1a25e2c1751d68be89e050b488652456e545b8019539137d | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/…
+13c1448f7ebb61f67e6fbd6cd5c188804c17c4d7e77c4b79b316ede4ef9cd9b3 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/…
+bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://jcenter.bintray.com/com/google/guava/guava/22.0/guava-22.0.pom
+c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://jcenter.bintray.com/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
+fee07b2760ef3ed20f2edefa70504a29f9216d277adae56ce85778ee4b18cd04 | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/23.4…
+6b5ad911a13a5c814c04be4376586eec15838158cb59b9f062ae138ddff1b861 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutl…
+932e6bab9a24a7bc958bbdb7e29e04d083b473d11c4ba3fab1e9b7149579f272 | https://jcenter.bintray.com/com/google/protobuf/protobuf-parent/3.0.0/proto…
+b787d574c851505e76212968b9ae1641ea79804aef7f5a2cee2a01cd4055213a | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common…
+8bd632c00bdf80a7de36c22b60f12452c147d8eca2f00d79d66699ebe7daa02a | https://jcenter.bintray.com/org/apache/commons/commons-parent/5/commons-par…
+52b6fd2eaf2240e14dbe752f1fa884270cc668d6f350e8e7f65f6033a8172d69 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client…
+c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar
+18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.…
+e2b4935e76d91b5abec44de309f2c8bb8d1d2e6cc0b8790b43cb654f1e22c722 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutl…
+f056ed61a281b3e230a63e4abf510c0d2f9bf7ff513cacb65a29538ba90ab177 | https://jcenter.bintray.com/org/jacoco/org.jacoco.build/0.7.4.201502262128/…
+74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.jar
+fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk…
+9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194 | https://jcenter.bintray.com/org/apache/apache/4/apache-4.pom
+cf251279505960889b6b281c26af0438656ebac3845e52791925cf7649cb15a6 | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdk…
+21bb4d44dff54e33a37c11af69859a714202ae00969aab5453eba7276688f8ec | https://jcenter.bintray.com/org/apache/httpcomponents/project/4.1.1/project…
diff --git a/projects/tor-android-service/gradle.patch b/projects/tor-android-service/gradle.patch
new file mode 100644
index 0000000..89347c9
--- /dev/null
+++ b/projects/tor-android-service/gradle.patch
@@ -0,0 +1,38 @@
+diff --git a/build.gradle b/build.gradle
+index 178278e..d80d0b5 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -4,6 +4,7 @@ buildscript {
+ repositories {
+ google()
+ jcenter()
++ maven { url System.getenv("GRADLE_MAVEN_REPO") }
+ }
+ dependencies {
+ classpath "com.android.tools.build:gradle:${androidplugin}"
+@@ -19,6 +20,7 @@ allprojects {
+ jcenter()
+ maven { url "https://jitpack.io" }
+ maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
++ maven { url System.getenv("GRADLE_MAVEN_REPO") }
+ }
+ }
+
+diff --git a/service/build.gradle b/service/build.gradle
+index b414557..f57d9b3 100644
+--- a/service/build.gradle
++++ b/service/build.gradle
+@@ -16,13 +16,6 @@ android {
+ }
+ }
+
+- externalNativeBuild {
+- ndkBuild {
+- path "src/main/jni/Android.mk"
+- buildStagingDirectory "./outputs/ndk-build"
+- }
+- }
+-
+ lintOptions {
+ abortOnError false
+ }
diff --git a/projects/tor-android-service/require-api.patch b/projects/tor-android-service/require-api.patch
new file mode 100644
index 0000000..43b7842
--- /dev/null
+++ b/projects/tor-android-service/require-api.patch
@@ -0,0 +1,28 @@
+diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java
+index d280a29..beb2b02 100644
+--- a/service/src/main/java/org/torproject/android/service/TorService.java
++++ b/service/src/main/java/org/torproject/android/service/TorService.java
+@@ -12,7 +12,10 @@ import android.net.ConnectivityManager;
+ import android.net.NetworkInfo;
+ import android.os.Build;
+ import android.os.IBinder;
+-import android.support.annotation.RequiresApi;
++// Not available in 23.4.0
++// https://developer.android.com/reference/android/support/annotation/Requires…
++//import android.support.annotation.RequiresApi;
++import android.annotation.TargetApi;
+ import android.text.TextUtils;
+ import android.util.Log;
+ import com.msopentech.thali.android.toronionproxy.AndroidOnionProxyManager;
+@@ -93,7 +96,10 @@ public final class TorService extends Service implements TorServiceConstants, Or
+ startService(intentVpn);
+ }
+
+- @RequiresApi(api = Build.VERSION_CODES.O)
++ // Use TargetApi until we use a support library version that adds the
++ // RequriesApi annotation
++ //@RequiresApi(api = Build.VERSION_CODES.O)
++ @TargetApi(value = Build.VERSION_CODES.O)
+ private void createNotificationChannel(String appName, String appDescription) {
+ int importance = NotificationManager.IMPORTANCE_LOW;
+ NotificationChannel mChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, appName,
1
0
commit aff3fdfdf45435e1a47f7539480fb81483b8bb9e
Author: emma peel <emma.peel(a)riseup.net>
Date: Fri Apr 12 10:00:33 2019 +0200
add Arabic language
---
databags/about+ar.ini | 1 +
databags/alternatives.ini | 6 ++++++
databags/menu+ar.ini | 19 +++++++++++++++++++
databags/menu_footer+ar.ini | 1 +
tpo.lektorproject | 5 +++++
5 files changed, 32 insertions(+)
diff --git a/databags/about+ar.ini b/databags/about+ar.ini
new file mode 120000
index 0000000..234b948
--- /dev/null
+++ b/databags/about+ar.ini
@@ -0,0 +1 @@
+about+en.ini
\ No newline at end of file
diff --git a/databags/alternatives.ini b/databags/alternatives.ini
index 08ed5a5..7d0f479 100644
--- a/databags/alternatives.ini
+++ b/databags/alternatives.ini
@@ -4,6 +4,12 @@ order = order-last
url = /
language = English (en)
+[ar]
+direction = text-right
+order = order-first
+url = /ar/
+language = عربية (ar)
+
[bn]
direction = text-left
order = order-last
diff --git a/databags/menu+ar.ini b/databags/menu+ar.ini
new file mode 100644
index 0000000..d77e346
--- /dev/null
+++ b/databags/menu+ar.ini
@@ -0,0 +1,19 @@
+[about]
+path = /about/history
+label = About
+
+[documentation]
+path = https://2019.www.torproject.org/docs/documentation.html.en
+label = Documentation
+
+[support]
+path = https://support.torproject.org/
+label = Support
+
+[blog]
+path = https://blog.torproject.org
+label = Blog
+
+[donate]
+path = https://donate.torproject.org
+label = Donate
diff --git a/databags/menu_footer+ar.ini b/databags/menu_footer+ar.ini
new file mode 120000
index 0000000..a3178a1
--- /dev/null
+++ b/databags/menu_footer+ar.ini
@@ -0,0 +1 @@
+menu_footer+en.ini
\ No newline at end of file
diff --git a/tpo.lektorproject b/tpo.lektorproject
index a7fbe12..e1bacb0 100644
--- a/tpo.lektorproject
+++ b/tpo.lektorproject
@@ -10,6 +10,11 @@ primary = yes
url_prefix = /
locale = en
+[alternatives.ar]
+name = عربية (ar)
+url_prefix = /ar/
+locale = ar
+
[alternatives.bn]
name = বাংলা ভাষা (bn)
url_prefix = /bn/
1
0
[tor-browser/tor-browser-60.6.1esr-8.5-1] Pulling in latest Torbutton code (2.1.6)
by gk＠torproject.org 12 Apr '19
by gk＠torproject.org 12 Apr '19
12 Apr '19
commit 2d33b8c80b2b7ef4588923e6afc39a2bd4628ab8
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Apr 12 07:30:12 2019 +0000
Pulling in latest Torbutton code (2.1.6)
---
toolkit/torproject/torbutton | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index 498d64784659..717715be0827 160000
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit 498d64784659082877bc83ecca24fbf8d137125f
+Subproject commit 717715be0827e3c4c9d4a6815f3c8027de3cee7e
1
0