May 2020 - tor-commits - lists.torproject.org

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 09 May '20

09 May '20

commit e4f82d5a2ec0b7fb78f1f14a603a744fe68b046a Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 9 04:23:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 9dd907cace..524a2c028e 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -7116,7 +7116,7 @@ msgid "" "Keeping backups of the identity keys so you can restore a relay in the " "future is the recommended way to ensure the reputation of the relay won't be" " wasted." -msgstr "" +msgstr "给身份密钥进行备份，这样您就可以在未来修复中继服务器。这是我们推荐的确保中继服务器的名誉不被浪费的方法。" #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -7987,6 +7987,8 @@ msgid "" "For feedback or issues related to our websites: " "[ux](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)" msgstr "" +"想要反馈或有关我们网站的问题：[ux] (https://lists.torproject.org/cgi-" +"bin/mailman/listinfo/ux)" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 09 May '20

09 May '20

commit 1b6e1eb88e2a38eed1e0158295936181511aa6ce Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 9 02:50:39 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ar.po | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 936e30ccf2..bf9b7b337d 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -2381,7 +2381,7 @@ msgstr "مشروع الحارس يوفر متصفح تور للأندرويد ع msgid "" "If you would prefer installing the app from F-Droid, please follow these " "steps:" -msgstr "" +msgstr "إذا كنت تفضل تحميل التطبيق من F-Droid، يرجى اتباع الخطوات التالية:" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2389,26 +2389,28 @@ msgid "" "1. Install the F-Droid app on your Android device from [the F-droid " "website.](https://f-droid.org/)" msgstr "" +"1. قم بتثبيت تطبيق F-Droid على هاتفك الأندرويد من [الموقع الرسمي] " +"(https://f-droid.org/)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "2. After installing F-Droid, open the app." -msgstr "" +msgstr "2. بعد تثبيت تطبيق F-Droid قم بفتحه." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "3. At the lower-right-hand corner, open \"Settings\"." -msgstr "" +msgstr "3. من الزاوية أسفل اليمين افتح قائمة الإعدادات \"Settings\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "4. Under the \"My Apps\" section, open Repositories." -msgstr "" +msgstr "4. من قسم \"My Apps\" قم بتفح المستودعات Repositories." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "5. Toggle \"Guardian Project Official Releases\" as enabled." -msgstr "" +msgstr "5. قم بتمكين خيار \"Guardian Project Official Releases\" كخيار مفعل." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2416,16 +2418,18 @@ msgid "" "6. Now F-Droid downloads the list of apps from the Guardian Project's " "repository (Note: this may take a few minutes)." msgstr "" +"6. الآن تطبيق F-Droid سيقوم بتنزيل قائمة من التطبيقات من مستودع مشروع الحارس" +" Guardian Project (ربما يستغرق هذا بعض الدقائق)." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "7. Tap the Back button at the upper-left-hand corner." -msgstr "" +msgstr "7. اضغط على زر العودة Back من الزاوية في أعلى اليسار." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "8. Open \"Latest\" at the lower-left-hand corner." -msgstr "" +msgstr "8. قم بقتح الأحدث \"Latest\" من الزاوية أسفل اليسار." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2433,21 +2437,23 @@ msgid "" "10. Open the search screen by tapping the magnifying glass at the lower-" "right side." msgstr "" +"10. قم بتفح شاشة البحث بالضغط على زر العدسة المكبرة من الجانب في أسفل " +"اليمين." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "11. Search for \"Tor Browser for Android\"." -msgstr "" +msgstr "11. قم بالبحث عن متصفح تور للأندرويد \"Tor Browser for Android\"." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "12. Open the query result by \"The Tor Project\" and install." -msgstr "" +msgstr "12. قم بفتح نتيجة الاستعلام مشروع تور \"The Tor Project\" وقم بالتثبيت." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### The Tor Project website" -msgstr "" +msgstr "#### موقع مشروع تور" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2456,11 +2462,13 @@ msgid "" "apk from the [Tor Project " "website](https://www.torproject.org/download/#android)." msgstr "" +"يمكن أيضًا الحصول على متصفح تور للأندوريد عبر تحميل وتثبيت نسخة التطبيق APK " +"من موقع مشروع تور (https://www.torproject.org/download/#android)" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### RUNNING TOR BROWSER FOR ANDROID FOR THE FIRST TIME" -msgstr "" +msgstr "### تشغيل متصفح تور على الأندرويد للمرة الأولى" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2469,11 +2477,13 @@ msgid "" "connect directly to the Tor network, or to configure Tor Browser for your " "connection with the settings icon." msgstr "" +"عند تشغيل متصفح تور للمرة الأولى، سوف ترى خيار اتصل مباشرةً بشبكة تور، أو " +"تهيئة متصفح تور لاتصالك من أيقونة الإعدادات." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### Connect" -msgstr "" +msgstr "#### اتصل" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2481,6 +2491,8 @@ msgid "" "<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" "/android-connect.png\" alt=\"Connect to Tor Browser for Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-connect.png\" alt=\"Connect to Tor Browser for Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2488,6 +2500,8 @@ msgid "" "Once clicked, changing sentences will appear at the bottom of the screen, " "indicating Tor’s connection progress." msgstr "" +"فور الضغط، عبارات التغيير سوف تظهر في أسفل الشاشة للإشارة إلى تقدم اتصال " +"تور." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2496,11 +2510,14 @@ msgid "" " at a certain point, see the [Troubleshooting](https://tb-" "manual.torproject.org/troubleshooting) page for help solving the problem." msgstr "" +"إذا كنت تستخدم اتصال سريع لكن نسبة التقدم توقفت عند نقطة معينة، راجع صفحة " +"[استكشاف الأخطاء وإصلاحها] (https://tb-" +"manual.torproject.org/troubleshooting) للمساعدة في حل المشكلة." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### Configure" -msgstr "" +msgstr "#### التهيئة" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2508,6 +2525,8 @@ msgid "" "<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" "/android-configure.png\" alt=\"Configure Tor Browser for Android\">" msgstr "" +"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images" +"/android-configure.png\" alt=\"Configure Tor Browser for Android\">" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2515,6 +2534,7 @@ msgid "" "If you know that your connection is censored, you should select the settings" " icon." msgstr "" +"إذا كنت تعلم أن اتصالك خاضع للرقابة، يجب عليك الضغط على أيقونة الإعدادات." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2522,6 +2542,8 @@ msgid "" "The first screen asks if access to the Tor network is blocked or censored on" " your connection." msgstr "" +"الشاشة الأولى ستسأل إذا كان الوصول إلى شبكة تور محجوب أو مراقب في اتصالك " +"بالإنترنت" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2530,6 +2552,8 @@ msgid "" "connect to the Tor network and no other solutions have worked, click the " "switch." msgstr "" +"إذا كنت تعلم أن اتصالك بالإنترنت يخضع للرقابة، أو حاولت الاتصال بشبكة تور " +"ولكن فشلت، ولا توجد أي حلول أخرى نجحت، اضغط على تحويل." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2537,6 +2561,8 @@ msgid "" "You will then be taken to the [Circumvention](/mobile-tor/#circumvention) " "screen to configure a pluggable transport." msgstr "" +"سيتم تحويلك إلى واجهة [التحايل](/mobile-tor/#circumvention) لإعداد ناقل قابل" +" للتوصيل." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[manual/develop] Fix grammar
by gus＠torproject.org 08 May '20

08 May '20

commit 16af541bf592f004c4bddceda4e23ba483b5a410 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Apr 1 01:32:26 2020 +0000 Fix grammar --- content/bridges/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index dfadea2..5b084cf 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -31,7 +31,7 @@ Because bridge addresses are not public, you will need to request them yourself. If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Request a bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Click "Connect" to save your settings. -Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Request a bridge from torproject.org", click "Request a New Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Your setting will automatically be saved once you close the tab. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge," and from the option "Request a bridge from torproject.org," click "Request a New Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Your setting will automatically be saved once you close the tab. ### ENTERING BRIDGE ADDRESSES @@ -41,6 +41,6 @@ Once you have obtained some bridge addresses, you will need to enter them into T If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Provide a bridge I know" and enter each bridge address on a separate line. Click "Connect" to save your settings. -Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Provide a bridge I know," enter each bridge address on a separate line. Your setting will automatically be saved once you close the tab. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge," and from the option "Provide a bridge I know," enter each bridge address on a separate line. Your setting will automatically be saved once you close the tab. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again.

1 0

[manual/develop] Headings
by gus＠torproject.org 08 May '20

08 May '20

commit e2d44265efe53105bb157957a6a4f3a0a57df340 Author: Enjeck Cleopatra <32180937+PROTechThor(a)users.noreply.github.com> Date: Thu Apr 2 09:29:50 2020 +0100 Headings --- content/mobile-tor/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/mobile-tor/contents.lr b/content/mobile-tor/contents.lr index a809a9f..5bf7a50 100644 --- a/content/mobile-tor/contents.lr +++ b/content/mobile-tor/contents.lr @@ -10,7 +10,7 @@ key: 15 --- body: -#### Tor Browser for Android +### Tor Browser for Android Tor Browser for Android is the only official mobile browser supported and developed by the Tor Project. It is like the desktop Tor Browser, but for your Android mobile device. Some of the prime features of Tor Browser for Android include: reducing tracking across websites, defending against surveillance, resisting browser fingerprinting, and circumventing censorship. @@ -195,6 +195,8 @@ At the moment, there are some features which are not available in Tor Browser fo * You can't take screenshots while using Tor Browser for Android. [#27987](https://trac.torproject.org/projects/tor/ticket/27987) * You can't save images. [#31013](https://trac.torproject.org/projects/tor/ticket/31013) +### More about Tor on mobile devices + #### Orfox Orfox was first released in 2015 by The Guardian Project, with the aim of giving Android users a way to browse the internet over Tor. Over the next three years, Orfox continously improved and became a popular way for people to browse the internet with more privacy

1 0

[manual/develop] Moving content to bottom of page
by gus＠torproject.org 08 May '20

08 May '20

commit fa87bdbdb8a2ba9910d3f51d2e43eed573e19ea5 Author: Enjeck Cleopatra <32180937+PROTechThor(a)users.noreply.github.com> Date: Thu Feb 13 18:47:56 2020 +0100 Moving content to bottom of page --- content/mobile-tor/contents.lr | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/content/mobile-tor/contents.lr b/content/mobile-tor/contents.lr index 78fcc07..a809a9f 100644 --- a/content/mobile-tor/contents.lr +++ b/content/mobile-tor/contents.lr @@ -15,20 +15,6 @@ Tor Browser for Android is the only official mobile browser supported and develo It is like the desktop Tor Browser, but for your Android mobile device. Some of the prime features of Tor Browser for Android include: reducing tracking across websites, defending against surveillance, resisting browser fingerprinting, and circumventing censorship. -#### Orfox -Orfox was first released in 2015 by The Guardian Project, with the aim of giving Android users a way to browse the internet over Tor. -Over the next three years, Orfox continously improved and became a popular way for people to browse the internet with more privacy -than standard browsers, and Orfox was crucial for helping people circumvent censorship and access blocked sites and critical resources. -In 2019, [Orfox was sunsetted](https://blog.torproject.org/orfox-paved-way-tor-browser-android) after the official Tor Browser for -Android was released. - -#### Orbot -Orbot is a free proxy app that empowers other apps to use the Tor network. -Orbot uses Tor to encrypt your Internet traffic. Then you can use it with other apps installed on your mobile device to -circumvent censorship and protect against surveillance. -Orbot can be downloaded and installed from [Google Play](https://play.google.com/store/apps/details?id=org.torproject.android). -Check out [our Support portal](https://support.torproject.org/tormobile/tormobile-6/) to know if you need both Tor Browser for Android and Orbot or either one. - ### DOWNLOADING AND INSTALLATION @@ -209,6 +195,20 @@ At the moment, there are some features which are not available in Tor Browser fo * You can't take screenshots while using Tor Browser for Android. [#27987](https://trac.torproject.org/projects/tor/ticket/27987) * You can't save images. [#31013](https://trac.torproject.org/projects/tor/ticket/31013) +#### Orfox +Orfox was first released in 2015 by The Guardian Project, with the aim of giving Android users a way to browse the internet over Tor. +Over the next three years, Orfox continously improved and became a popular way for people to browse the internet with more privacy +than standard browsers, and Orfox was crucial for helping people circumvent censorship and access blocked sites and critical resources. +In 2019, [Orfox was sunsetted](https://blog.torproject.org/orfox-paved-way-tor-browser-android) after the official Tor Browser for +Android was released. + +#### Orbot +Orbot is a free proxy app that empowers other apps to use the Tor network. +Orbot uses Tor to encrypt your Internet traffic. Then you can use it with other apps installed on your mobile device to +circumvent censorship and protect against surveillance. +Orbot can be downloaded and installed from [Google Play](https://play.google.com/store/apps/details?id=org.torproject.android). +Check out [our Support portal](https://support.torproject.org/tormobile/tormobile-6/) to know if you need both Tor Browser for Android and Orbot or either one. + ### Tor Browser for iOS There is no Tor Browser for iOS.

1 0

[manual/develop] Fix active 'nav-item' in side nav mobile view
by gus＠torproject.org 08 May '20

08 May '20

commit 7f6cc269e39651f4615ecf399b34937d5ad25c19 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Apr 1 18:42:43 2020 +0000 Fix active 'nav-item' in side nav mobile view --- templates/sidenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sidenav.html b/templates/sidenav.html index 3a154a1..9fab4c0 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -15,7 +15,7 @@ <ul class="nav nav-pills flex-column"> {% set topicbag = 'topics' %} {% for id, item in bag(topicbag).items() %} - <li{% if this.is_child_of(item.path) %} class="nav-item" {% else %} class="toc-entry toc-h2 nav-item"{% endif %}> + <li{% if this.is_child_of(item.path) %} class="toc-entry toc-h2 active nav-item" {% else %} class="toc-entry toc-h2 nav-item"{% endif %}> {% if this.alt != "en" %} {% set p = '/' + this.alt + '/' + item.path %} {% else %}

1 0

[manual/develop] Update Bridges page
by gus＠torproject.org 08 May '20

08 May '20

commit be349e3ea7b525345aa7ff442338de58e97c17da Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Apr 1 01:29:11 2020 +0000 Update Bridges page --- assets/static/images/request-a-bridge.png | Bin 0 -> 17195 bytes content/bridges/contents.lr | 12 +++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/assets/static/images/request-a-bridge.png b/assets/static/images/request-a-bridge.png new file mode 100644 index 0000000..21bcd53 Binary files /dev/null and b/assets/static/images/request-a-bridge.png differ diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index 161bfaa..dfadea2 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -27,13 +27,11 @@ Because bridge addresses are not public, you will need to request them yourself. ### USING MOAT -If you're starting Tor Browser for the first time, click 'Configure' to open the Tor Network Settings window. -Otherwise, click on 'Preferences' in the hamburger menu (main menu) and then on 'Tor' in the sidebar. +<img class="col-md-6" align="right" hspace="5" src="../../static/images/request-a-bridge.png"> -In the Tor Network Settings window, select 'Tor is censored in my country.' -Then, select 'Request a bridge from torproject.org' and click 'Request a bridge...' +If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Request a bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Click "Connect" to save your settings. -Complete the CAPTCHA and click 'Submit'. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Request a bridge from torproject.org", click "Request a New Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Your setting will automatically be saved once you close the tab. ### ENTERING BRIDGE ADDRESSES @@ -41,8 +39,8 @@ Complete the CAPTCHA and click 'Submit'. Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher. -If you're starting Tor Browser for the first time, click 'Configure' to open the Tor Network Settings window. Otherwise, click on 'Preferences' in the hamburger menu (main menu) and then on 'Tor' in the sidebar to access these options. +If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Provide a bridge I know" and enter each bridge address on a separate line. Click "Connect" to save your settings. -In 'Bridges' section, check the box 'Use a bridge', then, select 'Provide a bridge I know' and enter each bridge address on a separate line. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Provide a bridge I know," enter each bridge address on a separate line. Your setting will automatically be saved once you close the tab. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again.

1 0

[manual/develop] Merge branch 'update-circumvention-page#29'
by gus＠torproject.org 08 May '20

08 May '20

commit 375abde080afeb9b783601fac1f5af35b9341e97 Merge: 7d368a8 22816b0 Author: gus <gus(a)torproject.org> Date: Fri Apr 10 16:07:33 2020 -0400 Merge branch 'update-circumvention-page#29' content/circumvention/contents.lr | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)

1 0

[manual/develop] Merge branch 'update-bridges-page#30'
by gus＠torproject.org 08 May '20

08 May '20

commit 5fd77e4ac3807b8e701d31629515b6b4eeb12805 Merge: 816545c 16af541 Author: gus <gus(a)torproject.org> Date: Fri Apr 10 16:18:20 2020 -0400 Merge branch 'update-bridges-page#30' assets/static/images/request-a-bridge.png | Bin 0 -> 17195 bytes content/bridges/contents.lr | 12 +++++------- 2 files changed, 5 insertions(+), 7 deletions(-)

1 0

[manual/develop] Merge remote-tracking branch 'cleo/patch-2'
by gus＠torproject.org 08 May '20

08 May '20

commit 7d368a8cf66631dc25d70129176a34fd2ac9c971 Merge: 61415a7 e2d4426 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Apr 2 18:53:47 2020 +0100 Merge remote-tracking branch 'cleo/patch-2' Moving Orbot/Orfox to the bottom of page closes #26 on gitlab content/mobile-tor/contents.lr | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)

1 0