[tor-commits] [tor-browser-build/master] Update OpenSSL to 1.0.2n

2017-12-13 Thread gk
commit 813aefd174f31ddbbc473be64aa66f7fbc08e301 Author: Georg Koppen Date: Wed Dec 13 11:47:14 2017 + Update OpenSSL to 1.0.2n --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config

[tor-commits] [atlas/master] Bump cache breaker

2017-12-13 Thread irl
commit f9957b78946ee586931e597588a786fac7c181cf Author: Iain R. Learmonth Date: Wed Dec 13 14:30:28 2017 + Bump cache breaker --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 22d8491..6c9bcdd 100644 ---

[tor-commits] [tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 23104: Add a default line height compensation

2017-12-13 Thread gk
commit 89d8bc54cfe6a4cd999ab1f16f434c4fb809b643 Author: Igor Oliveira Date: Sun Dec 10 18:16:59 2017 -0200 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2017-12-13 Thread translation
commit 77b95615e68ecef53d3710a1e9467edb44813e25 Author: Translation commit bot Date: Wed Dec 13 14:15:39 2017 + Update translations for https_everywhere --- hu/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [atlas/master] Bump cache breaker

2017-12-13 Thread irl
commit 837aea5f0c1c00b8ea3b55c2c8fc26856f19a00f Author: Iain R. Learmonth Date: Wed Dec 13 14:36:54 2017 + Bump cache breaker --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 6c9bcdd..1e08772 100644 ---

[tor-commits] [atlas/master] Revert "Escape contact information before display in template"

2017-12-13 Thread irl
commit 71c4518b2e654e98d5050b5ee97d64d0beafa554 Author: Iain R. Learmonth Date: Wed Dec 13 14:36:27 2017 + Revert "Escape contact information before display in template" This reverts commit 37a65a761afa5a62630c620ac00f42a228604df7. ---

[tor-commits] [tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 24398: Plugin-container process exhausts memory

2017-12-13 Thread gk
commit cef2fe28a238d7e445d7c5b4292bfe27c1b71bca Author: Georg Koppen Date: Wed Dec 13 14:15:57 2017 + Bug 24398: Plugin-container process exhausts memory The plugin-container process can thrash/crash due to increasing memory consumption after our

[tor-commits] [tor/master] Changes file for 24374, merged earlier.

2017-12-13 Thread nickm
commit 8441189b3caee2e4cf58a8b2c080b25a3a9b0cfc Author: Nick Mathewson Date: Wed Dec 13 09:50:53 2017 -0500 Changes file for 24374, merged earlier. --- changes/bug24374 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug24374 b/changes/bug24374 new

[tor-commits] [atlas/master] Fixes SVG downloads for Firefox 58

2017-12-13 Thread irl
commit 7d68fb16762c04360c73eb4b14798658c51e8953 Author: Iain R. Learmonth Date: Thu Dec 14 05:16:23 2017 + Fixes SVG downloads for Firefox 58 See: https://blog.mozilla.org/security/2017/11/27/blocking-top-level-navigations-data-urls-firefox-58/ ---

[tor-commits] [torspec/master] Typo fixes in prop#249, prop#276, and prop#279.

2017-12-13 Thread isis
commit 686aaf110551c6d586f069e3ae6f8be6820bce8d Author: Isis Lovecruft Date: Wed Dec 13 23:52:15 2017 + Typo fixes in prop#249, prop#276, and prop#279. --- proposals/249-large-create-cells.txt | 2 +- proposals/276-lower-bw-granularity.txt | 2 +-

[tor-commits] [torspec/master] prop#249: Add example of how to avoid exhausting RELAY_EARLY cells.

2017-12-13 Thread isis
commit d3f18989ce583a348d3e525e8abee314f18fe91e Author: Isis Lovecruft Date: Wed Dec 13 23:56:25 2017 + prop#249: Add example of how to avoid exhausting RELAY_EARLY cells. --- proposals/249-large-create-cells.txt | 7 ++- 1 file changed, 6 insertions(+), 1

[tor-commits] [torspec/master] prop#249: Add note on padding being randomness or zeroes.

2017-12-13 Thread isis
commit 03a9d4f13431f6f09b3d8c26c6b01dcbaf9685ae Author: Isis Lovecruft Date: Wed Dec 13 23:50:29 2017 + prop#249: Add note on padding being randomness or zeroes. --- proposals/249-large-create-cells.txt | 10 +- 1 file changed, 5 insertions(+), 5

[tor-commits] [torspec/master] prop#249: Add section on new consensus parameters.

2017-12-13 Thread isis
commit c119bd7800b1489aa178da7c5c2b1dfdc323ff27 Author: Isis Lovecruft Date: Thu Dec 14 01:23:52 2017 + prop#249: Add section on new consensus parameters. --- proposals/249-large-create-cells.txt | 8 1 file changed, 8 insertions(+) diff --git

[tor-commits] [torspec/master] Add Ticket: field for prop#140.

2017-12-13 Thread isis
commit ca22bb0f496f8984234aa1d2061f271d018bae7d Author: Isis Lovecruft Date: Wed Dec 13 23:49:33 2017 + Add Ticket: field for prop#140. --- proposals/140-consensus-diffs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/proposals/140-consensus-diffs.txt

[tor-commits] [torspec/master] prop#249: Add recommendation on equal number of cells in each direction.

2017-12-13 Thread isis
commit 21e79aec731e068c0ba92c50f5fa5d3f5132b003 Author: Isis Lovecruft Date: Wed Dec 13 23:51:21 2017 + prop#249: Add recommendation on equal number of cells in each direction. --- proposals/249-large-create-cells.txt | 8 1 file changed, 8 insertions(+)

[tor-commits] [torspec/master] prop#249: Add link specifiers and a section on new subprotocol numbers.

2017-12-13 Thread isis
commit 7af62db0b06aac937b8f349bd667ad20a9776f79 Author: Isis Lovecruft Date: Thu Dec 14 00:51:52 2017 + prop#249: Add link specifiers and a section on new subprotocol numbers. --- proposals/249-large-create-cells.txt | 63 ++-- 1

[tor-commits] [torspec/master] prop#249: Add detail on padding the number of bytes in each direction.

2017-12-13 Thread isis
commit 5c0962b76ff415ed088128ecfd92b0e4879ecb96 Author: Isis Lovecruft Date: Thu Dec 14 01:22:31 2017 + prop#249: Add detail on padding the number of bytes in each direction. --- proposals/249-large-create-cells.txt | 4 1 file changed, 4 insertions(+) diff

[tor-commits] [torspec/master] prop#249: Add section on updates to required/recommended subprotocols.

2017-12-13 Thread isis
commit 3578da4f1fa02b145c2d55480089a49b60346eab Author: Isis Lovecruft Date: Thu Dec 14 01:23:16 2017 + prop#249: Add section on updates to required/recommended subprotocols. --- proposals/249-large-create-cells.txt | 10 ++ 1 file changed, 10

[tor-commits] [torspec/master] prop#249: Add note about interaction with OOM manager.

2017-12-13 Thread isis
commit bbb7f092a0c0bcf821c30dfc01493d0887c926ae Author: Isis Lovecruft Date: Thu Dec 14 00:08:30 2017 + prop#249: Add note about interaction with OOM manager. --- proposals/249-large-create-cells.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git

[tor-commits] [torspec/master] prop#249: Add myself as an author so I get blamed for anything dumb.

2017-12-13 Thread isis
commit 5fe5456988900b01eb86bd03b1224b4f5cd018fe Author: Isis Lovecruft Date: Thu Dec 14 01:24:17 2017 + prop#249: Add myself as an author so I get blamed for anything dumb. --- proposals/249-large-create-cells.txt | 3 ++- 1 file changed, 2 insertions(+), 1

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2017-12-13 Thread translation
commit 78285ee84985c8fefeeefb30978cebdcd9d5d81d Author: Translation commit bot Date: Wed Dec 13 16:16:59 2017 + Update translations for tor-launcher-network-settings --- hu/network-settings.dtd | 18 +- 1 file changed, 9 insertions(+), 9

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2017-12-13 Thread translation
commit 8dbf57379c7efac240567aa6d66ff2d7a48c5568 Author: Translation commit bot Date: Wed Dec 13 16:16:37 2017 + Update translations for tor-launcher-properties --- hu/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2017-12-13 Thread translation
commit 70d8377c234c6c9bfba8ae7e16d6f5c532c0f79a Author: Translation commit bot Date: Wed Dec 13 16:16:43 2017 + Update translations for tor-launcher-properties_completed --- hu/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

[tor-commits] [metrics-web/master] Updates list of services (Fixes: #24414)

2017-12-13 Thread karsten
commit 85f298ea8a04d3625b88eae34f9a71f112fe3e8d Author: Iain R. Learmonth Date: Sat Dec 2 14:21:06 2017 + Updates list of services (Fixes: #24414) Adds: * tormap.void.gr * OrNetStats Removes: * compass.tpo (retired) * OnionView (link

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2017-12-13 Thread translation
commit c61c1939b0853b29003d2e91a03057725112d951 Author: Translation commit bot Date: Wed Dec 13 15:45:55 2017 + Update translations for liveusb-creator --- hu/hu.po | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-)

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2017-12-13 Thread translation
commit f5e13f741de881fe016f3ec3351c3240f6f4c01d Author: Translation commit bot Date: Wed Dec 13 16:15:54 2017 + Update translations for liveusb-creator --- hu/hu.po | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff

[tor-commits] [metrics-web/master] Update news.json to version 204 of doc/MetricsTimeline.

2017-12-13 Thread karsten
commit 1deb7910bd6422011492431c7cd2711a9065b4d9 Author: Karsten Loesing Date: Wed Dec 13 17:58:24 2017 +0100 Update news.json to version 204 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 37 +++- 1 file changed,

[tor-commits] [tor/release-0.3.2] Start on an 0.3.2.7-rc changelog

2017-12-13 Thread nickm
commit 6ff333f627389a267846fcd0a53a5f9603b4ad64 Author: Nick Mathewson Date: Wed Dec 13 12:11:17 2017 -0500 Start on an 0.3.2.7-rc changelog --- ChangeLog | 76 + changes/bug18859| 7 -

[tor-commits] [tor/release-0.3.2] edit changelog a bit

2017-12-13 Thread nickm
commit 304e2151ac96bad8d5f27c63b070b06683d50665 Author: Nick Mathewson Date: Wed Dec 13 12:17:34 2017 -0500 edit changelog a bit --- ChangeLog | 103 ++ 1 file changed, 50 insertions(+), 53 deletions(-)

[tor-commits] [tor/master] remove changes files that will appear in 0.3.2.7-rc

2017-12-13 Thread nickm
commit 102b4f3a920368e42fdf34367ee542195619ac2d Author: Nick Mathewson Date: Wed Dec 13 12:08:52 2017 -0500 remove changes files that will appear in 0.3.2.7-rc --- changes/bug18859| 7 --- changes/bug23603| 7 --- changes/bug23696| 5 -

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-12-13 Thread translation
commit c8a5ccd39df88a52589dee2b8c7b1555fd3012be Author: Translation commit bot Date: Wed Dec 13 16:50:38 2017 + Update translations for tor-browser-manual --- hu/hu.po | 36 1 file changed, 32 insertions(+), 4

[tor-commits] [tor/release-0.3.2] vim sometimes makes swo tempfiles

2017-12-13 Thread nickm
commit ca8e9813bf125d68d64228d1bb39a170ae6ea16b Author: Nick Mathewson Date: Wed Dec 13 12:07:45 2017 -0500 vim sometimes makes swo tempfiles --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 671288d41..4dc8867a8 100644

[tor-commits] [tor/maint-0.3.2] vim sometimes makes swo tempfiles

2017-12-13 Thread nickm
commit ca8e9813bf125d68d64228d1bb39a170ae6ea16b Author: Nick Mathewson Date: Wed Dec 13 12:07:45 2017 -0500 vim sometimes makes swo tempfiles --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 671288d41..4dc8867a8 100644

[tor-commits] [tor/release-0.3.2] update to 0.3.2.7-rc

2017-12-13 Thread nickm
commit 93b3c4b8448914b6f3753829a965603fe15c059c Author: Nick Mathewson Date: Wed Dec 13 12:06:09 2017 -0500 update to 0.3.2.7-rc --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/master] update to 0.3.2.7-rc

2017-12-13 Thread nickm
commit 93b3c4b8448914b6f3753829a965603fe15c059c Author: Nick Mathewson Date: Wed Dec 13 12:06:09 2017 -0500 update to 0.3.2.7-rc --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-13 Thread nickm
commit 4c015d9fe4abf54f5e3d8929fa62b916789e158f Merge: 37fba82c1 93b3c4b84 Author: Nick Mathewson Date: Wed Dec 13 12:06:52 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-12-13 Thread nickm
commit 1fb3d37c08be1c1e9501990d1762c0fbb1f9388d Merge: 8441189b3 93b3c4b84 Author: Nick Mathewson Date: Wed Dec 13 12:06:43 2017 -0500 Merge branch 'maint-0.3.2' "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/maint-0.3.2] update to 0.3.2.7-rc

2017-12-13 Thread nickm
commit 93b3c4b8448914b6f3753829a965603fe15c059c Author: Nick Mathewson Date: Wed Dec 13 12:06:09 2017 -0500 update to 0.3.2.7-rc --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-12-13 Thread translation
commit d7b217f5b7a0e0eba447cc7e817a4c4aeac04eba Author: Translation commit bot Date: Wed Dec 13 17:20:36 2017 + Update translations for tor-browser-manual --- hu/hu.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hu/hu.po

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-12-13 Thread translation
commit 8a57c86df9c7baaf41f663fd57ecfb76e0f35a7e Author: Translation commit bot Date: Wed Dec 13 16:20:45 2017 + Update translations for tor-browser-manual --- hu/hu.po | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-12-13 Thread nickm
commit 9b714697739f3665c49c84e9a439285c75ad3bbc Merge: 1fb3d37c0 ca8e9813b Author: Nick Mathewson Date: Wed Dec 13 12:07:46 2017 -0500 Merge branch 'maint-0.3.2' .gitignore | 1 + 1 file changed, 1 insertion(+) ___

[tor-commits] [tor/master] vim sometimes makes swo tempfiles

2017-12-13 Thread nickm
commit ca8e9813bf125d68d64228d1bb39a170ae6ea16b Author: Nick Mathewson Date: Wed Dec 13 12:07:45 2017 -0500 vim sometimes makes swo tempfiles --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 671288d41..4dc8867a8 100644

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-13 Thread nickm
commit 0834f4d93dc808bc2f01350635719551762fee69 Merge: 4c015d9fe ca8e9813b Author: Nick Mathewson Date: Wed Dec 13 12:07:46 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 .gitignore | 1 + 1 file changed, 1 insertion(+)

[tor-commits] [webwml/master] Add hrefs to the heading anchors in the answers. (#24519)

2017-12-13 Thread hiro
commit f87eea1a1a9f45bb15db61e6c970765d0784f235 Author: kat Date: Mon Dec 11 14:12:42 2017 -0500 Add hrefs to the heading anchors in the answers. (#24519) --- docs/en/faq.wml | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git

[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into faq-hrefs-for-anchors

2017-12-13 Thread hiro
commit 99f445f943b9abec3677b5af9931c629657a55a8 Merge: f87eea1a 53990269 Author: hiromipaw Date: Wed Dec 13 16:16:38 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into faq-hrefs-for-anchors .gitignore

[tor-commits] [webwml/master] Reword Sukhbir's people page entry

2017-12-13 Thread atagar
commit 34c7baf25e9de5ddaf45721b72186a1614f59faf Author: Damian Johnson Date: Wed Dec 13 11:34:23 2017 -0800 Reword Sukhbir's people page entry Tweaking the wording per his request. --- about/en/corepeople.wml | 2 +- 1 file changed, 1 insertion(+), 1

[tor-commits] [orbot/master] update UI tweaks for next release

2017-12-13 Thread n8fr8
commit 6a19bf6c8e6de9057f217addc72eff69c2b09508 Author: n8fr8 Date: Thu Dec 7 16:58:16 2017 -0500 update UI tweaks for next release --- .../org/torproject/android/OrbotMainActivity.java | 108 +++ app/src/main/res/layout-land/layout_main.xml | 153

[tor-commits] [orbot/master] don't show app selection each time you turn VPN on/off

2017-12-13 Thread n8fr8
commit 3741434eaf1149ffd17e22080c44dde17f9b47fd Author: n8fr8 Date: Thu Dec 7 15:45:23 2017 -0500 don't show app selection each time you turn VPN on/off --- .../org/torproject/android/OrbotMainActivity.java | 25 +-

[tor-commits] [orbot/master] move "other" installer back to tor resource installer

2017-12-13 Thread n8fr8
commit 4df2fcfd5001c357cbbb7aa98f2770d3000aec87 Author: n8fr8 Date: Thu Dec 7 15:44:54 2017 -0500 move "other" installer back to tor resource installer --- .../src/main/java/org/torproject/android/service/TorService.java| 2 ++ 1 file changed, 2 insertions(+)

[tor-commits] [orbot/master] work on the new UI update

2017-12-13 Thread n8fr8
commit 7303a33311fe4cabcba70ab298a1cc8e782e0a9c Author: n8fr8 Date: Fri Dec 8 11:56:11 2017 -0500 work on the new UI update --- app/build.gradle | 1 + app/src/fullperm/AndroidManifest.xml | 6 +-

[tor-commits] [orbot/master] fix issues with bridge selection UI

2017-12-13 Thread n8fr8
commit 47e10e780606d68ab0c559283ef777a1ca4878b5 Author: n8fr8 Date: Mon Dec 11 15:25:10 2017 -0500 fix issues with bridge selection UI --- .../org/torproject/android/OrbotMainActivity.java | 52 +++--- .../torproject/android/ui/AppManagerActivity.java

[tor-commits] [orbot/master] more UI updates and small improvements

2017-12-13 Thread n8fr8
commit e6bd23a1e253824989d5b643543700d3cc8f1c26 Author: n8fr8 Date: Mon Dec 11 15:02:05 2017 -0500 more UI updates and small improvements --- .../org/torproject/android/OrbotMainActivity.java | 267 -

[tor-commits] [orbot/master] update spuport library version

2017-12-13 Thread n8fr8
commit 5500b504599da44a9281b0d470baa9bd1f2f6069 Author: n8fr8 Date: Wed Dec 13 15:11:15 2017 -0500 update spuport library version --- app/build.gradle | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle

[tor-commits] [orbot/master] fix handling of intents

2017-12-13 Thread n8fr8
commit 7210223b0223daf138bd078f5e7ad1e31c8ed5d3 Author: n8fr8 Date: Wed Dec 13 14:03:06 2017 -0500 fix handling of intents --- .../org/torproject/android/OrbotMainActivity.java | 87 +- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git

[tor-commits] [orbot/master] don't delete installed binaries

2017-12-13 Thread n8fr8
commit f3f9162867f27531019b0ff674713825cb665dc2 Author: n8fr8 Date: Thu Dec 7 15:44:06 2017 -0500 don't delete installed binaries --- .../service/util/OtherResourceInstaller.java| 21 ++--- 1 file changed, 2 insertions(+), 19 deletions(-) diff

[tor-commits] [orbot/master] fix title for tor app section

2017-12-13 Thread n8fr8
commit b68132b8c5f6cde12af312190f673441ad3218f4 Author: n8fr8 Date: Wed Dec 13 14:03:31 2017 -0500 fix title for tor app section --- app/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values/strings.xml

[tor-commits] [orbot/master] tweak layout

2017-12-13 Thread n8fr8
commit 877406fa793229823a9f1566d140a4febfdfd279 Author: n8fr8 Date: Wed Dec 13 14:03:51 2017 -0500 tweak layout --- app/src/main/res/layout/layout_apps.xml | 2 +- app/src/main/res/layout/layout_main.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff

[tor-commits] [orbot/master] improve notifications, add refresh/newnym button

2017-12-13 Thread n8fr8
commit 546310a4965408bfb5fa445d566f59479935bfa3 Author: n8fr8 Date: Wed Dec 13 15:07:52 2017 -0500 improve notifications, add refresh/newnym button --- .../android/settings/SettingsPreferences.java | 9 +- .../res/layout/layout_notification_expanded.xml| 106

[tor-commits] [orbot/master] more UI updates

2017-12-13 Thread n8fr8
commit d9bd32a646c7ad9c698dfd898589dacaac3694b5 Author: n8fr8 Date: Fri Dec 8 16:11:34 2017 -0500 more UI updates --- .../org/torproject/android/OrbotMainActivity.java | 52 --- app/src/main/res/layout/layout_main.xml| 160 +