[tor-commits] [dev/staging] Fix project-ideas section

[pili]

commit 2ae4bca2ab5c4fc038cc8b52c08d6f3706643dcc
Author: Pili Guerra 
Date:   Wed Jun 17 15:57:10 2020 +0100

Fix project-ideas section
---
 content/project-ideas/contents.lr   | 8 +++-
 templates/{gsoc.html => project-ideas.html} | 0
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/content/project-ideas/contents.lr 
b/content/project-ideas/contents.lr
index e56ab2b..9be0bac 100644
--- a/content/project-ideas/contents.lr
+++ b/content/project-ideas/contents.lr
@@ -1,12 +1,10 @@
 _template: layout.html
 ---
-_undiscoverable: true
+section: project-ideas
 ---
-section: GSoC
+section_id: project-ideas
 ---
-section_id: gsoc

-html: gsoc.html
+html: project-ideas.html
 ---
 color: primary
 ---
diff --git a/templates/gsoc.html b/templates/project-ideas.html
similarity index 100%
rename from templates/gsoc.html
rename to templates/project-ideas.html

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [dev/staging] Add PTs to AntiCensorship team

[pili]

commit 6c53bb8b0c19b0c1fd1870ea471a94e55834ef1b
Author: Pili Guerra 
Date:   Wed Jun 17 14:58:42 2020 +0100

Add PTs to AntiCensorship team
---
 content/anti-censorship/pluggable-transports/goptlib/contents.lr | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/content/anti-censorship/pluggable-transports/goptlib/contents.lr 
b/content/anti-censorship/pluggable-transports/goptlib/contents.lr
new file mode 100644
index 000..e69de29



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [dev/staging] Update lego

[pili]

commit e1a58d76693460743d8eb254080a51beb6cbe449
Author: hiro 
Date:   Fri May 15 14:52:41 2020 +0200

Update lego
---
 databags/menu+bn-BD.ini| 1 -
 databags/menu+de.ini   | 1 -
 databags/menu+en.ini   | 1 -
 databags/menu+es.ini   | 1 -
 databags/menu+fr.ini   | 1 -
 databags/menu+id.ini   | 1 -
 databags/menu+is.ini   | 1 -
 databags/menu+it.ini   | 1 -
 databags/menu+ka.ini   | 1 -
 databags/menu+ko.ini   | 1 -
 databags/menu+pt-BR.ini| 1 -
 databags/menu+ru.ini   | 1 -
 databags/menu+tr.ini   | 1 -
 databags/menu+zh-CN.ini| 1 -
 databags/menu_footer+bn-BD.ini | 1 -
 databags/menu_footer+de.ini| 1 -
 databags/menu_footer+en.ini| 1 -
 databags/menu_footer+es.ini| 1 -
 databags/menu_footer+fr.ini| 1 -
 databags/menu_footer+id.ini| 1 -
 databags/menu_footer+is.ini| 1 -
 databags/menu_footer+it.ini| 1 -
 databags/menu_footer+ka.ini| 1 -
 databags/menu_footer+ko.ini| 1 -
 databags/menu_footer+pt-BR.ini | 1 -
 databags/menu_footer+ru.ini| 1 -
 databags/menu_footer+tr.ini| 1 -
 databags/menu_footer+zh-CN.ini | 1 -
 databags/pagenav+de.ini| 1 -
 databags/pagenav+es.ini| 1 -
 databags/pagenav+fr.ini| 1 -
 databags/pagenav+it.ini| 1 -
 databags/pagenav+pt-BR.ini | 1 -
 databags/pagenav+ru.ini| 1 -
 lego   | 2 +-
 35 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini
deleted file mode 12
index c9b2dc8..000
--- a/databags/menu+bn-BD.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+bn-BD.ini
\ No newline at end of file
diff --git a/databags/menu+de.ini b/databags/menu+de.ini
deleted file mode 12
index 6bb02de..000
--- a/databags/menu+de.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+de.ini
\ No newline at end of file
diff --git a/databags/menu+en.ini b/databags/menu+en.ini
deleted file mode 12
index 1fa7edf..000
--- a/databags/menu+en.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+en.ini
\ No newline at end of file
diff --git a/databags/menu+es.ini b/databags/menu+es.ini
deleted file mode 12
index fd8def3..000
--- a/databags/menu+es.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+es.ini
\ No newline at end of file
diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini
deleted file mode 12
index 5366289..000
--- a/databags/menu+fr.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+fr.ini
\ No newline at end of file
diff --git a/databags/menu+id.ini b/databags/menu+id.ini
deleted file mode 12
index 7c2858b..000
--- a/databags/menu+id.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+id.ini
\ No newline at end of file
diff --git a/databags/menu+is.ini b/databags/menu+is.ini
deleted file mode 12
index b02aed7..000
--- a/databags/menu+is.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+is.ini
\ No newline at end of file
diff --git a/databags/menu+it.ini b/databags/menu+it.ini
deleted file mode 12
index fcdde73..000
--- a/databags/menu+it.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+it.ini
\ No newline at end of file
diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini
deleted file mode 12
index 336d4ad..000
--- a/databags/menu+ka.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+ka.ini
\ No newline at end of file
diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini
deleted file mode 12
index 31e262b..000
--- a/databags/menu+ko.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+ko.ini
\ No newline at end of file
diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini
deleted file mode 12
index fd27afb..000
--- a/databags/menu+pt-BR.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+pt-BR.ini
\ No newline at end of file
diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini
deleted file mode 12
index 6f30a3e..000
--- a/databags/menu+ru.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+ru.ini
\ No newline at end of file
diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini
deleted file mode 12
index 8a01592..000
--- a/databags/menu+tr.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+tr.ini
\ No newline at end of file
diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini
deleted file mode 12
index 425a6f8..000
--- a/databags/menu+zh-CN.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+zh-CN.ini
\ No newline at end of file
diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini
deleted file mode 12
index 5dd8aed..000
--- a/databags/menu_footer+bn-BD.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu_footer+bn-BD.ini
\ No newline at end of file
diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini
deleted file mode 12
index 851da53..000
--- 

[tor-commits] [dev/staging] Project ideas pages for future GSoC/Outreachy/etc... iterations

[pili]

commit 56428a833e593885fd666c072534107be6c06759
Author: Pili Guerra 
Date:   Wed Jun 17 14:12:56 2020 +0100

Project ideas pages for future GSoC/Outreachy/etc... iterations
---
 .../cloudflare-captcha-monitoring/contents.lr  |  2 +-
 .../project-ideas/gettor-distribution/contents.lr  |  2 +-
 content/project-ideas/onion-toolbox/contents.lr|  2 +-
 .../ooni-explorer-advanced-search/contents.lr  |  2 +-
 .../ooni-probe-experiments/contents.lr |  2 +-
 .../privacy-aware-geo-lookup/contents.lr   |  2 +-
 .../project-ideas/privacy-friendly-web/contents.lr |  2 +-
 .../salmon-bridge-distribution/contents.lr |  2 +-
 .../snowflake-android-proxy/contents.lr|  2 +-
 content/project-ideas/tor-keygen/contents.lr   |  2 +-
 .../tor-relay-ipv6-support/contents.lr |  2 +-
 content/project-ideas/tor-weather/contents.lr  |  2 +-
 templates/project-page.html| 43 ++
 13 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/content/project-ideas/cloudflare-captcha-monitoring/contents.lr 
b/content/project-ideas/cloudflare-captcha-monitoring/contents.lr
index c311934..1726aeb 100644
--- a/content/project-ideas/cloudflare-captcha-monitoring/contents.lr
+++ b/content/project-ideas/cloudflare-captcha-monitoring/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/gettor-distribution/contents.lr 
b/content/project-ideas/gettor-distribution/contents.lr
index 797a2ff..e3d664e 100644
--- a/content/project-ideas/gettor-distribution/contents.lr
+++ b/content/project-ideas/gettor-distribution/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/onion-toolbox/contents.lr 
b/content/project-ideas/onion-toolbox/contents.lr
index 1d52e87..07de9c0 100644
--- a/content/project-ideas/onion-toolbox/contents.lr
+++ b/content/project-ideas/onion-toolbox/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/ooni-explorer-advanced-search/contents.lr 
b/content/project-ideas/ooni-explorer-advanced-search/contents.lr
index be381fd..219ad3a 100644
--- a/content/project-ideas/ooni-explorer-advanced-search/contents.lr
+++ b/content/project-ideas/ooni-explorer-advanced-search/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/ooni-probe-experiments/contents.lr 
b/content/project-ideas/ooni-probe-experiments/contents.lr
index 1eb568e..a9f87ab 100644
--- a/content/project-ideas/ooni-probe-experiments/contents.lr
+++ b/content/project-ideas/ooni-probe-experiments/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/privacy-aware-geo-lookup/contents.lr 
b/content/project-ideas/privacy-aware-geo-lookup/contents.lr
index e170747..301b44a 100644
--- a/content/project-ideas/privacy-aware-geo-lookup/contents.lr
+++ b/content/project-ideas/privacy-aware-geo-lookup/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/privacy-friendly-web/contents.lr 
b/content/project-ideas/privacy-friendly-web/contents.lr
index 7ab642b..e464859 100644
--- a/content/project-ideas/privacy-friendly-web/contents.lr
+++ b/content/project-ideas/privacy-friendly-web/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/salmon-bridge-distribution/contents.lr 
b/content/project-ideas/salmon-bridge-distribution/contents.lr
index 8ec5614..fd9fc25 100644
--- a/content/project-ideas/salmon-bridge-distribution/contents.lr
+++ b/content/project-ideas/salmon-bridge-distribution/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/snowflake-android-proxy/contents.lr 
b/content/project-ideas/snowflake-android-proxy/contents.lr
index f922efb..a3213fa 100644
--- a/content/project-ideas/snowflake-android-proxy/contents.lr
+++ b/content/project-ideas/snowflake-android-proxy/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/tor-keygen/contents.lr 
b/content/project-ideas/tor-keygen/contents.lr
index f32192f..5b41591 100644
--- a/content/project-ideas/tor-keygen/contents.lr
+++ b/content/project-ideas/tor-keygen/contents.lr
@@ -1,4 +1,4 @@
-_model: project
+_model: idea
 ---
 _template: layout.html
 ---
diff --git a/content/project-ideas/tor-relay-ipv6-support/contents.lr 
b/content/project-ideas/tor-relay-ipv6-support/contents.lr
index 86518a2..d327d6a 100644
--- a/content/project-ideas/tor-relay-ipv6-support/contents.lr
+++ b/content/project-ideas/tor-relay-ipv6-support/contents.lr
@@ -1,4 +1,4 @@
-_model

[tor-commits] [community/develop] Create page to list relay-associations. Will fix #63

[pili]

commit 2aed0f19b70e585bc9cf3c7ec26701bfea8fe892
Author: Pili Guerra 
Date:   Wed Mar 25 19:00:27 2020 +

Create page to list relay-associations. Will fix #63
---
 .../relay-associations/contents.lr |  19 +++
 databags/relay-associations.ini| 149 +
 templates/relay-associations.html  |  35 +
 3 files changed, 203 insertions(+)

diff --git 
a/content/relay-operations/community-resources/relay-associations/contents.lr 
b/content/relay-operations/community-resources/relay-associations/contents.lr
new file mode 100644
index 000..28cc246
--- /dev/null
+++ 
b/content/relay-operations/community-resources/relay-associations/contents.lr
@@ -0,0 +1,19 @@
+_model: page
+---
+color: primary
+---
+title: Relay Associations
+---
+html: relay-associations.html
+---
+key: 6
+---
+section: Community Resources
+---
+section_id: community-resources
+---
+subtitle: Here is a list of currently active relay associations.
+---
+body:
+
+Please let us know if you would like your relay association to be listed on 
this page.
\ No newline at end of file
diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini
new file mode 100644
index 000..3979727
--- /dev/null
+++ b/databags/relay-associations.ini
@@ -0,0 +1,149 @@
+[zwiebelfreunde]
+link = 
+image = 
+label = Zwiebelfreunde e.V.
+country = Germany
+contact = 
+active = True
+display = True
+donate = 
+
+[nosoignons]
+link = https://nos-oignons.net/
+image = 
+label = Nos-oignons
+country = France
+contact = contact at nos-oignons.net
+active = True
+display = 
+donate = 
+
+[enn]
+link = https://enn.lu/
+image = 
+label = Frënn vun der Ënn A.S.B.L.
+country = Luxembourg
+contact = i...@enn.lu
+active = True
+display =
+donate =  
+
+[hartvoorinternetvrijheid]
+link = https://www.hartvoorinternetvrijheid.nl/
+image = 
+label = Hart voor Internetvrijheid
+country = Netherlands
+contact = best...@hartvoorinternetvrijheid.nl
+active = True
+display =
+donate =  
+
+[saveyourprivacy]
+link = https://saveyourprivacy.net
+image = 
+label = SaveYourPrivacy e.V.
+country = Germany
+contact = i...@saveyourprivacy.net
+active = True
+display =
+donate =  
+
+[coldhak]
+link = https://coldhak.ca/relays/
+image = 
+label = Coldhak
+country = Canada
+contact = https://coldhak.ca/about/
+active = True
+display =
+donate =  
+
+[appliedprivacy]
+link = https://appliedprivacy.net/
+image = 
+label = Foundation for Applied Privacy
+country = Austria
+contact = t...@appliedprivacy.net
+active = True
+display =
+donate =  
+
+[dfri]
+link = https://www.dfri.se/
+image = 
+label = Föreningen för Digitala Fri- och Rättigheter
+country = Sweden
+contact = d...@dfri.se
+active = True
+display =
+donate =  
+
+[calyxinstitute]
+link = https://www.calyxinstitute.org
+image = 
+label = The Calyx Institute
+country = US
+contact = n...@calyx.com
+active = True
+display =
+donate =  
+
+[noisetor]
+link = https://noisetor.net
+image = 
+label = NoiseTor
+country = US
+contact = 
+active = 
+display =
+donate =  
+
+[icetor]
+link = https://icetor.is/
+image = 
+label = Icetor
+country = Iceland
+contact =  admin  icetor  is 
+active = 
+display =
+donate =  
+
+[privacyfoundation]
+link = https://www.privacyfoundation.ch/
+image = 
+label = Swiss Privacy Foundation
+country = Switzerland
+contact = off...@privacyfoundation.ch
+active = 
+display =
+donate =  
+
+[digitalcourage]
+link = https://digitalcourage.de/support/tor
+image = 
+label = Digital Courage
+country = Germany
+contact = 
+active = True
+display =
+donate =  
+
+[accessnow]
+link = https://accessnow.net
+image = 
+label = Access Now
+country = US
+contact = 
+active = True
+display =
+donate = 
+
+[brasshorncommunications]
+link = https://brasshorncommunications.uk/projects/tor/
+image = 
+label = BrassHorn Communications
+country = UK
+contact = he...@brasshorncommunications.uk
+active = True
+display =
+donate =  
\ No newline at end of file
diff --git a/templates/relay-associations.html 
b/templates/relay-associations.html
new file mode 100644
index 000..10448d8
--- /dev/null
+++ b/templates/relay-associations.html
@@ -0,0 +1,35 @@
+
+  {% include 'sidenav.html' %}
+  
+{{ this.body }}
+
+  
+
+  
+
+  Organization Name
+  Country
+
+  
+  
+  {% for id, item in bag('relay-associations').items() %}
+{% if item.active == 'True' %}
+
+
+{% if item.link|length %}
+{{ item.label }}
+{% else %}
+{{ item.label }}
+{% endif %}
+
+
+{{ item.country }}
+
+{% endif %}
+  {% endfor %}
+  
+
+  
+
+  
+
\ No newline at end of file

[tor-commits] [community/master] Add printable outreach materials

[pili]

commit 9e56edf34c5bd1d0ef859409037bf92c549af3ce
Merge: b2ca078 14bbc3b
Author: Pili Guerra 
Date:   Mon Apr 13 17:33:43 2020 +0100

Add printable outreach materials

Closes #28

 content/outreach/kit/contents.lr  |  2 +-
 databags/outreach-materials.ini   | 54 +++
 templates/outreach-materials.html | 36 ++
 3 files changed, 91 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Add printable outreach materials

[pili]

commit 14bbc3b24fc29135d5e2d38ee3985da348b141c7
Author: Pili Guerra 
Date:   Wed Apr 8 18:32:23 2020 +0100

Add printable outreach materials

Closes #28
---
 content/outreach/kit/contents.lr  |  2 +-
 databags/outreach-materials.ini   | 54 +++
 templates/outreach-materials.html | 36 ++
 3 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/content/outreach/kit/contents.lr b/content/outreach/kit/contents.lr
index 59e782a..7f00085 100644
--- a/content/outreach/kit/contents.lr
+++ b/content/outreach/kit/contents.lr
@@ -12,7 +12,7 @@ subtitle: This kit includes printable flyers, stickers, and 
other materials to g
 ---
 key: 1
 ---
-html: two-columns-page.html
+html: outreach-materials.html
 ---
 body:
 
diff --git a/databags/outreach-materials.ini b/databags/outreach-materials.ini
new file mode 100644
index 000..178b23b
--- /dev/null
+++ b/databags/outreach-materials.ini
@@ -0,0 +1,54 @@
+[anti-censorship]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_anti-censorship_en_EN.pdf
+filename_back = Back_stencil_en_EN.pdf
+label = Tor for Anti-censorship
+type = handout
+year = 2019
+
+[feminists]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_feminist_en_EN.pdf
+filename_back = Back_feminist_en_EN.pdf
+label = Tor for Feminists
+type = handout
+year = 2019
+
+[human-rights]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_humanrights_en_EN.pdf
+filename_back = Back_stencil_en_EN.pdf
+label = Tor for Human Rights
+type = handout
+year = 2019
+
+[privacy]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_privacy_en_EN.pdf
+filename_back = Back_stencil_en_EN.pdf
+label = Tor for Privacy
+type = handout
+year = 2019
+
+[one-pager]
+location = https://media.torproject.org/misc/
+filename_front = 2018-08-Tor-one-pager.pdf#page=1
+filename_back = 2018-08-Tor-one-pager.pdf#page=2
+label = Tor one pager
+type = handout
+year = 2018
+
+[relay]
+location = 
https://gitlab.torproject.org/torproject/ux/media/-/raw/master/outreach-material/handouts/
+filename_front = tor-relay_4.25x11_card_front.jpg
+filename_back = tor-relay-4.25x11_card_back.jpg
+label = Run a relay
+type = handout
+year = 2018
+
+[brochure]
+location = https://media.torproject.org/misc/2015-03-tor-brochure/
+filename = tor-brochure-en.pdf
+label = Tor Brochure
+type = brochure
+year = 2015
\ No newline at end of file
diff --git a/templates/outreach-materials.html 
b/templates/outreach-materials.html
new file mode 100644
index 000..d0bdaa8
--- /dev/null
+++ b/templates/outreach-materials.html
@@ -0,0 +1,36 @@
+
+  {% include 'sidenav.html' %}
+  
+{{ this.body }}
+
+  
+
+  
+
+  Title
+  Type
+  Links
+  Last Updated
+
+  
+  
+  {% for id, item in bag('outreach-materials').items() %}
+
+  {{ item.label }}
+  {{ item.type }}
+  
+{% if item.type=='handout' %}
+  Front 
/ Back
+{% else %}
+  File
+{% endif %}
+  
+  {{ item.year }}
+
+  {% endfor %}
+  
+
+  
+
+  
+
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [dev/staging] More placeholder structure and content

[pili]

commit 1a9bffd6b65f1da42e0a3c2f6279a64a57f35d8e
Author: Pili Guerra 
Date:   Fri Feb 28 21:16:37 2020 +0100

More placeholder structure and content
---
 content/anti-censorship/pluggable-transports/meek/contents.lr  | 0
 content/anti-censorship/pluggable-transports/obfs4/contents.lr | 0
 content/anti-censorship/pluggable-transports/snowflake/contents.lr | 0
 content/applications/rbm/contents.lr   | 0
 content/applications/tor-browser/contents.lr   | 0
 content/applications/tor-launcher/contents.lr  | 0
 content/applications/torbirdy/contents.lr  | 0
 content/applications/torcheck/contents.lr  | 0
 content/applications/tormessenger/contents.lr  | 0
 content/applications/torsocks/contents.lr  | 0
 content/metrics/collector/contents.lr  | 0
 content/metrics/exonerator/contents.lr | 0
 content/metrics/metrics-lib/contents.lr| 0
 content/metrics/onionoo/contents.lr| 0
 content/metrics/onionperf/contents.lr  | 0
 content/metrics/portal/contents.lr | 0
 content/network/chutney/contents.lr| 0
 content/network/doctor/contents.lr | 0
 content/network/libervent/contents.lr  | 0
 content/network/nyx/contents.lr| 0
 content/network/onionbalance/contents.lr   | 0
 content/network/stem/contents.lr   | 0
 content/network/txtorcon/contents.lr   | 0
 23 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/content/anti-censorship/pluggable-transports/meek/contents.lr 
b/content/anti-censorship/pluggable-transports/meek/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/anti-censorship/pluggable-transports/obfs4/contents.lr 
b/content/anti-censorship/pluggable-transports/obfs4/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/anti-censorship/pluggable-transports/snowflake/contents.lr 
b/content/anti-censorship/pluggable-transports/snowflake/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/applications/rbm/contents.lr 
b/content/applications/rbm/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/applications/tor-browser/contents.lr 
b/content/applications/tor-browser/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/applications/tor-launcher/contents.lr 
b/content/applications/tor-launcher/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/applications/torbirdy/contents.lr 
b/content/applications/torbirdy/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/applications/torcheck/contents.lr 
b/content/applications/torcheck/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/applications/tormessenger/contents.lr 
b/content/applications/tormessenger/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/applications/torsocks/contents.lr 
b/content/applications/torsocks/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/metrics/collector/contents.lr 
b/content/metrics/collector/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/metrics/exonerator/contents.lr 
b/content/metrics/exonerator/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/metrics/metrics-lib/contents.lr 
b/content/metrics/metrics-lib/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/metrics/onionoo/contents.lr 
b/content/metrics/onionoo/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/metrics/onionperf/contents.lr 
b/content/metrics/onionperf/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/metrics/portal/contents.lr 
b/content/metrics/portal/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/network/chutney/contents.lr 
b/content/network/chutney/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/network/doctor/contents.lr 
b/content/network/doctor/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/network/libervent/contents.lr 
b/content/network/libervent/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/network/nyx/contents.lr b/content/network/nyx/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/network/onionbalance/contents.lr 
b/content/network/onionbalance/contents.lr
new file mode 100644
index 000..e69de29
diff --git a/content/network/stem/contents.lr b/content/network/stem

[tor-commits] [dev/staging] Add project ideas

[pili]

commit 4b312f3dc00ab52f4fe62274f04fc52c1dd0161a
Author: Pili Guerra 
Date:   Fri Feb 28 21:25:22 2020 +0100

Add project ideas
---
 .../cloudflare-captcha-monitoring/contents.lr  | 70 +++
 .../project-ideas/gettor-distribution/contents.lr  | 50 +
 content/project-ideas/onion-toolbox/contents.lr| 67 ++
 .../ooni-explorer-advanced-search/contents.lr  | 61 
 .../ooni-probe-experiments/contents.lr | 61 
 .../privacy-aware-geo-lookup/contents.lr   | 56 +++
 .../project-ideas/privacy-friendly-web/contents.lr | 59 
 .../salmon-bridge-distribution/contents.lr | 48 +
 .../snowflake-android-proxy/contents.lr| 47 +
 content/project-ideas/tor-keygen/contents.lr   | 49 +
 .../tor-relay-ipv6-support/contents.lr | 81 ++
 content/project-ideas/tor-weather/contents.lr  | 77 
 12 files changed, 726 insertions(+)

diff --git a/content/project-ideas/cloudflare-captcha-monitoring/contents.lr 
b/content/project-ideas/cloudflare-captcha-monitoring/contents.lr
new file mode 100644
index 000..c311934
--- /dev/null
+++ b/content/project-ideas/cloudflare-captcha-monitoring/contents.lr
@@ -0,0 +1,70 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 1
+---
+languages:
+python
+javascript
+---
+mentors:
+GeKo
+arma
+---
+difficulty: medium
+---
+title: Cloudflare CAPTCHA Monitoring
+---
+subtitle:
+
+This project should implement a mechanism to track the rate that Cloudflare 
fronted webpages return CAPTCHAs to Tor users over time.
+
+---
+body:
+
+# Problem
+
+A large number of Tor users report getting hit by infinite CAPTCHA loops when 
visiting webpages fronted by Cloudflare. This makes them feel punished for 
using Tor to protect their privacy and prevents them from legitimately 
accessing websites.
+
+# Proposal
+
+For this project we would like to track in practice how often Cloudflare 
fronted webpages return CAPTCHAs to Tor clients.
+
+Our proposed approach consists of:
+
+1. Setting up a very simple static webpage to be fronted by Cloudflare
+2. Write a web client to periodically fetch this static webpage via Tor and 
record how often a CAPTCHA is returned
+3. Record and graph CAPTCHA vs real page rates
+4. Using the pre-existing architecture, run a second client that does not 
fetch this webpage via Tor. This will allow us to contrast and compare how 
Cloudflare responds to Tor Browser vs other browsers.
+5. Track and publish these details publicly
+
+There are two interesting metrics to track over time: 
+
+- the fraction of exit relays that are getting hit with CAPTCHAs, and
+- the chance that a Tor client, choosing an exit relay in the normal weighted 
faction, will get hit by a CAPTCHA.
+
+Then there are other interesting patterns to look for:
+
+- Are certain IP addresses punished consistently and others never punished?
+- Is whether you get a CAPTCHA much more probabilistic and transient?
+- Does that pattern change over time?
+
+# Resources
+
+There is pre-existing research by the Berkeley ICSI group which includes these 
sorts of checks:
+
+- https://www.freehaven.net/anonbib/#differential-ndss2016
+- https://www.freehaven.net/anonbib/#exit-blocking2017
+
+For the original ticket and discussion, please see ticket 
[#33010](http://bugs.torproject.org/33010)
\ No newline at end of file
diff --git a/content/project-ideas/gettor-distribution/contents.lr 
b/content/project-ideas/gettor-distribution/contents.lr
new file mode 100644
index 000..797a2ff
--- /dev/null
+++ b/content/project-ideas/gettor-distribution/contents.lr
@@ -0,0 +1,50 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 2
+---
+languages:
+python
+ansible
+---
+org: Tor
+---
+mentors:
+cohosh
+hiro
+---
+difficulty: 
+---
+title: Implement new distribution methods for GetTor
+---
+subtitle:
+
+This project should implement a feature to distribute Tor Browser downloads 
through Telegram or Facebook messenger.
+
+---
+body:
+
+# Problem
+
+Tor Browser ships with a few different anti-censorship tools to allow people 
free and open access to Internet content. However, some places censor Tor 
Browser downloads, making it difficult for users to install it in the first 
place.
+
+# Proposal
+
+[GetTor](https://gettor.torproject.org/) is a system for distributing Tor 
Browser using alternative methods such as email or Twitter to send users 
authenticated links to Tor Browser binaries.
+
+We are looking to expand the ways in which GetTor distributes Tor Browser 
binaries to make it easier for people to download and install Tor Browser. This 
project would

[tor-commits] [community/master] Fix broken links

[pili]

commit fda798cb4113eaaf9c752d1b9b606f973dcdc3a0
Author: Nicolei Ocana 
Date:   Thu Apr 9 19:32:27 2020 +

Fix broken links

Merges #50 in github
Closes #120 in gitlab
---
 .../community-resources/eff-tor-legal-faq/contents.lr  | 2 +-
 .../community-resources/tor-abuse-templates/contents.lr| 2 +-
 .../community-resources/tor-exit-guidelines/contents.lr| 4 ++--
 .../community-resources/tor-relay-universities/contents.lr | 2 +-
 content/relay-operations/relays-requirements/contents.lr   | 2 +-
 .../technical-setup/guard/centosrhel/updates/contents.lr   | 2 +-
 content/user-research/guidelines/contents.lr   | 7 +++
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git 
a/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr 
b/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr
index 8e78678..b540deb 100644
--- a/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr
+++ b/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr
@@ -13,7 +13,7 @@ Therefore, please do not act on this information alone; if 
you have any specific
 
 Also, if you received this document from anywhere besides the EFF web site or 
https://community.torproject.org/relay/community-resources/eff-tor-legal-faq, 
it may be out of date. Follow the link to get the latest version.
 
-Got a DMCA notice? Check out our [sample response 
letter](/relay/community-resources/eff-tor-legal/faq/tor-dmca-response)!
+Got a DMCA notice? Check out our [sample response 
letter](/relay/community-resources/eff-tor-legal-faq/tor-dmca-response)!
 
 ## General Information
 
diff --git 
a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr 
b/content/relay-operations/community-resources/tor-abuse-templates/contents.lr
index d66ede9..007e0d2 100644
--- 
a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr
+++ 
b/content/relay-operations/community-resources/tor-abuse-templates/contents.lr
@@ -9,7 +9,7 @@ body:
 # Before You Start
 
 The best way to handle abuse complaints is to set up your exit node so that 
they are less likely to be sent in the first place.
-Please see [Tips for Running an Exit Node with Minimal 
Harassment](https://blog.torproject.org/running-exit-node) and [Tor Exit 
Guidelines](tor-exit-guidelines) for more info, before reading this document.
+Please see [Tips for Running an Exit Node with Minimal 
Harassment](https://blog.torproject.org/running-exit-node) and [Tor Exit 
Guidelines](/relay/community-resources/tor-exit-guidelines/) for more info, 
before reading this document.
 
 Below are a collection of letters you can use to respond to your ISP about 
their complaint in regards to your Tor exit server.
 
diff --git 
a/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr 
b/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr
index 049da51..6552154 100644
--- 
a/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr
+++ 
b/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr
@@ -27,7 +27,7 @@ A good ISP is one that offers cheap bandwidth and is not 
being used by other mem
 Before you continue, you may ask the Tor community if your choice is a good 
one.
 We very much need diversity, and it does not help if we pool too many exits at 
one friendly ISP.
 
-In any case, add the ISP to the [GoodBadISPs](good-bad-isps) page.
+In any case, add the ISP to the 
[GoodBadISPs](/relay/community-resources/good-bad-isps/) page.
 
 To find an ISP, go through forums and sites where ISPs posts their latest 
deals, and contact them about Tor hosting.
 Once you identified your ISP, you can follow the two-step advice of 
TorServers.net.
@@ -77,7 +77,7 @@ If you receive an abuse complaint, don't freak out! Here is 
some advice for you:
 
 TorServers.net is a fairly large Tor exit operator and we receive only a very 
small number of complaints, especially compared to the amount of traffic we 
push. Roughly 80% are automated reports, and the rest is usually satisfied with 
[our default reply](https://www.torservers.net/wiki/abuse/templates). We have 
not needed the input of a lawyer in many years of operation following the 
advice on this page.
 
-In addition to the [templates at 
Torservers.net](https://www.torservers.net/wiki/abuse/templates), you can find 
many more templates for various scenarios on the [Tor Abuse 
Templates](tor-abuse-templates) . It is exceptionally rare to encounter a 
scenario where none of these templates apply.
+In addition to the [templates at 
Torservers.net](https://www.torservers.net/wiki/abuse/templates), you can find 
many more templates for various scenarios on the [Tor Abuse 
Templates](/relay/community-resources/tor-abuse-templates/) . It is 
exceptionally rare to encounter a scenario where 

[tor-commits] [community/develop] Add year material was produced

[pili]

commit 1a940bc5daa95683f6e7be379939b302c766a6ba
Author: Pili Guerra 
Date:   Wed Apr 8 19:27:54 2020 +0100

Add year material was produced
---
 databags/outreach-materials.ini   | 30 +-
 templates/outreach-materials.html |  2 ++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/databags/outreach-materials.ini b/databags/outreach-materials.ini
index e530e50..178b23b 100644
--- a/databags/outreach-materials.ini
+++ b/databags/outreach-materials.ini
@@ -1,16 +1,10 @@
-[one-pager]
-location = https://media.torproject.org/misc/
-filename_front = 2018-08-Tor-one-pager.pdf#page=1
-filename_back = 2018-08-Tor-one-pager.pdf#page=2
-label = Tor one pager
-type = handout
-
 [anti-censorship]
 location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
 filename_front = Front_anti-censorship_en_EN.pdf
 filename_back = Back_stencil_en_EN.pdf
 label = Tor for Anti-censorship
 type = handout
+year = 2019
 
 [feminists]
 location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
@@ -18,6 +12,7 @@ filename_front = Front_feminist_en_EN.pdf
 filename_back = Back_feminist_en_EN.pdf
 label = Tor for Feminists
 type = handout
+year = 2019
 
 [human-rights]
 location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
@@ -25,6 +20,7 @@ filename_front = Front_humanrights_en_EN.pdf
 filename_back = Back_stencil_en_EN.pdf
 label = Tor for Human Rights
 type = handout
+year = 2019
 
 [privacy]
 location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
@@ -32,11 +28,27 @@ filename_front = Front_privacy_en_EN.pdf
 filename_back = Back_stencil_en_EN.pdf
 label = Tor for Privacy
 type = handout
+year = 2019
 
-[relay]
+[one-pager]
+location = https://media.torproject.org/misc/
+filename_front = 2018-08-Tor-one-pager.pdf#page=1
+filename_back = 2018-08-Tor-one-pager.pdf#page=2
+label = Tor one pager
+type = handout
+year = 2018
 
+[relay]
 location = 
https://gitlab.torproject.org/torproject/ux/media/-/raw/master/outreach-material/handouts/
 filename_front = tor-relay_4.25x11_card_front.jpg
 filename_back = tor-relay-4.25x11_card_back.jpg
 label = Run a relay
-type = handout
\ No newline at end of file
+type = handout
+year = 2018
+
+[brochure]
+location = https://media.torproject.org/misc/2015-03-tor-brochure/
+filename = tor-brochure-en.pdf
+label = Tor Brochure
+type = brochure
+year = 2015
\ No newline at end of file
diff --git a/templates/outreach-materials.html 
b/templates/outreach-materials.html
index d34d999..d0bdaa8 100644
--- a/templates/outreach-materials.html
+++ b/templates/outreach-materials.html
@@ -10,6 +10,7 @@
   Title
   Type
   Links
+  Last Updated
 
   
   
@@ -24,6 +25,7 @@
   File
 {% endif %}
   
+  {{ item.year }}
 
   {% endfor %}
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Add printable outreach materials

[pili]

commit f511e894f36b6e1957bb92428ebf040036dd87dc
Author: Pili Guerra 
Date:   Wed Apr 8 18:32:23 2020 +0100

Add printable outreach materials
---
 content/outreach/kit/contents.lr  |  2 +-
 databags/outreach-materials.ini   | 42 +++
 templates/outreach-materials.html | 34 +++
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/content/outreach/kit/contents.lr b/content/outreach/kit/contents.lr
index 59e782a..7f00085 100644
--- a/content/outreach/kit/contents.lr
+++ b/content/outreach/kit/contents.lr
@@ -12,7 +12,7 @@ subtitle: This kit includes printable flyers, stickers, and 
other materials to g
 ---
 key: 1
 ---
-html: two-columns-page.html
+html: outreach-materials.html
 ---
 body:
 
diff --git a/databags/outreach-materials.ini b/databags/outreach-materials.ini
new file mode 100644
index 000..e530e50
--- /dev/null
+++ b/databags/outreach-materials.ini
@@ -0,0 +1,42 @@
+[one-pager]
+location = https://media.torproject.org/misc/
+filename_front = 2018-08-Tor-one-pager.pdf#page=1
+filename_back = 2018-08-Tor-one-pager.pdf#page=2
+label = Tor one pager
+type = handout
+
+[anti-censorship]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_anti-censorship_en_EN.pdf
+filename_back = Back_stencil_en_EN.pdf
+label = Tor for Anti-censorship
+type = handout
+
+[feminists]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_feminist_en_EN.pdf
+filename_back = Back_feminist_en_EN.pdf
+label = Tor for Feminists
+type = handout
+
+[human-rights]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_humanrights_en_EN.pdf
+filename_back = Back_stencil_en_EN.pdf
+label = Tor for Human Rights
+type = handout
+
+[privacy]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_privacy_en_EN.pdf
+filename_back = Back_stencil_en_EN.pdf
+label = Tor for Privacy
+type = handout
+
+[relay]
+
+location = 
https://gitlab.torproject.org/torproject/ux/media/-/raw/master/outreach-material/handouts/
+filename_front = tor-relay_4.25x11_card_front.jpg
+filename_back = tor-relay-4.25x11_card_back.jpg
+label = Run a relay
+type = handout
\ No newline at end of file
diff --git a/templates/outreach-materials.html 
b/templates/outreach-materials.html
new file mode 100644
index 000..d34d999
--- /dev/null
+++ b/templates/outreach-materials.html
@@ -0,0 +1,34 @@
+
+  {% include 'sidenav.html' %}
+  
+{{ this.body }}
+
+  
+
+  
+
+  Title
+  Type
+  Links
+
+  
+  
+  {% for id, item in bag('outreach-materials').items() %}
+
+  {{ item.label }}
+  {{ item.type }}
+  
+{% if item.type=='handout' %}
+  Front 
/ Back
+{% else %}
+  File
+{% endif %}
+  
+
+  {% endfor %}
+  
+
+  
+
+  
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/staging] Add printable outreach materials

[pili]

commit b429e2406526d4f28af1153fcb7ebe3ee4ef40d8
Author: Pili Guerra 
Date:   Wed Apr 8 18:32:23 2020 +0100

Add printable outreach materials
---
 content/outreach/kit/contents.lr  |  2 +-
 databags/outreach-materials.ini   | 42 +++
 templates/outreach-materials.html | 34 +++
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/content/outreach/kit/contents.lr b/content/outreach/kit/contents.lr
index 59e782a..7f00085 100644
--- a/content/outreach/kit/contents.lr
+++ b/content/outreach/kit/contents.lr
@@ -12,7 +12,7 @@ subtitle: This kit includes printable flyers, stickers, and 
other materials to g
 ---
 key: 1
 ---
-html: two-columns-page.html
+html: outreach-materials.html
 ---
 body:
 
diff --git a/databags/outreach-materials.ini b/databags/outreach-materials.ini
new file mode 100644
index 000..e530e50
--- /dev/null
+++ b/databags/outreach-materials.ini
@@ -0,0 +1,42 @@
+[one-pager]
+location = https://media.torproject.org/misc/
+filename_front = 2018-08-Tor-one-pager.pdf#page=1
+filename_back = 2018-08-Tor-one-pager.pdf#page=2
+label = Tor one pager
+type = handout
+
+[anti-censorship]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_anti-censorship_en_EN.pdf
+filename_back = Back_stencil_en_EN.pdf
+label = Tor for Anti-censorship
+type = handout
+
+[feminists]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_feminist_en_EN.pdf
+filename_back = Back_feminist_en_EN.pdf
+label = Tor for Feminists
+type = handout
+
+[human-rights]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_humanrights_en_EN.pdf
+filename_back = Back_stencil_en_EN.pdf
+label = Tor for Human Rights
+type = handout
+
+[privacy]
+location = 
https://gitlab.torproject.org/torproject/community/outreach/-/raw/master/print/en_EN/
+filename_front = Front_privacy_en_EN.pdf
+filename_back = Back_stencil_en_EN.pdf
+label = Tor for Privacy
+type = handout
+
+[relay]
+
+location = 
https://gitlab.torproject.org/torproject/ux/media/-/raw/master/outreach-material/handouts/
+filename_front = tor-relay_4.25x11_card_front.jpg
+filename_back = tor-relay-4.25x11_card_back.jpg
+label = Run a relay
+type = handout
\ No newline at end of file
diff --git a/templates/outreach-materials.html 
b/templates/outreach-materials.html
new file mode 100644
index 000..d34d999
--- /dev/null
+++ b/templates/outreach-materials.html
@@ -0,0 +1,34 @@
+
+  {% include 'sidenav.html' %}
+  
+{{ this.body }}
+
+  
+
+  
+
+  Title
+  Type
+  Links
+
+  
+  
+  {% for id, item in bag('outreach-materials').items() %}
+
+  {{ item.label }}
+  {{ item.type }}
+  
+{% if item.type=='handout' %}
+  Front 
/ Back
+{% else %}
+  File
+{% endif %}
+  
+
+  {% endfor %}
+  
+
+  
+
+  
+
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/master] Headings

[pili]

commit e2d44265efe53105bb157957a6a4f3a0a57df340
Author: Enjeck Cleopatra <32180937+protecht...@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



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/master] Merge remote-tracking branch 'cleo/patch-2'

[pili]

commit 7d368a8cf66631dc25d70129176a34fd2ac9c971
Merge: 61415a7 e2d4426
Author: Pili Guerra 
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(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/master] Moving content to bottom of page

[pili]

commit fa87bdbdb8a2ba9910d3f51d2e43eed573e19ea5
Author: Enjeck Cleopatra <32180937+protecht...@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.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Update Circumvention page

[pili]

commit 382ed5142190f5b82c5ec5004491c99109563550
Author: Nicolei Ocana 
Date:   Tue Mar 31 16:16:11 2020 +

Update Circumvention page
---
 content/circumvention/contents.lr | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/content/circumvention/contents.lr 
b/content/circumvention/contents.lr
index f4548bf..641c23c 100644
--- a/content/circumvention/contents.lr
+++ b/content/circumvention/contents.lr
@@ -32,7 +32,7 @@ Currently there are three pluggable transports available, but 
more are being dev
 meek
 
 
-meek transports all make it look like you are browsing a major web site 
instead of using Tor. meek-azure makes it look like you are using a Microsoft 
web site.
+meek transports make it look like you are browsing a major web site 
instead of using Tor. meek-azure makes it look like you are using a Microsoft 
web site.
 
 
 
@@ -49,19 +49,17 @@ meek
 
 ### USING PLUGGABLE TRANSPORTS
 
-To use a pluggable transport, click 'Configure' when starting Tor Browser for 
the first time. In the window that appears, from the drop-down menu, select 
whichever pluggable transport you'd like to use.
+To use a pluggable transport, click "Configure" when starting Tor Browser for 
the first time. After checking the checkbox "Tor is censored in my country," 
choose "Select a built-in bridge" option. From the dropdown, select whichever 
pluggable transport you'd like to use. Once you've selected the pluggable 
transport, 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 'Bridges' section, check the box 'Use 
a bridge', and from the drop-down menu 'Select a built-in bridge', choose 
whichever pluggable transport you'd like to use.
-
-Once you've selected the pluggable transport you'd like to use, 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 dropdown "Select a built-in bridge", 
choose whichever pluggable transport you'd like to use. Your setting will 
automatically be saved once you close the tab.
 
 
 ### WHICH TRANSPORT SHOULD I USE?
 
 Each of the transports listed in Tor Launcher’s menu works in a different 
way, and their effectiveness depends on your individual circumstances.
 
-If you are trying to circumvent a blocked connection for the first time, you 
should try the different transports: obfs4, snowflake, and meek-azure.
+If you are trying to circumvent a blocked connection for the first time, you 
should try the different transports: obfs4, snowflake, or meek-azure.
 
-If you try all of these options, and none of them gets you online, you will 
need to enter bridge addresses manually.
+If you try all of these options and none of them gets you online, you can 
choose "Request a bridge from torproject.org" for BridgeDB to provide a bridge 
or "Provide a bridge I know" to manually enter bridge addresses.
 
 Read the [Bridges](/en-US/bridges/) section to learn what bridges are and how 
to obtain them.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Remove word 'to'

[pili]

commit d88a89f5a72465668f3285c00436d6c84144eace
Author: Nicolei Ocana 
Date:   Tue Mar 31 20:48:12 2020 +

Remove word 'to'
---
 content/circumvention/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/circumvention/contents.lr 
b/content/circumvention/contents.lr
index dbb9a10..07b6a89 100644
--- a/content/circumvention/contents.lr
+++ b/content/circumvention/contents.lr
@@ -60,6 +60,6 @@ Each of the transports listed in Tor Launcher’s menu works 
in a different way,
 
 If you are trying to circumvent a blocked connection for the first time, you 
should try the different transports: obfs4, snowflake, or meek-azure.
 
-If you try all of these options, and none of them gets you online, you will 
need to request a bridge or to manually enter bridge addresses.
+If you try all of these options, and none of them gets you online, you will 
need to request a bridge or manually enter bridge addresses.
 
 Read the [Bridges](/en-US/bridges/) section to learn what bridges are and how 
to obtain them.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Fix grammar

[pili]

commit 22816b0bd58266000348a3a8e8f8dc63b550c1f7
Author: Nicolei Ocana 
Date:   Wed Apr 1 01:07:28 2020 +

Fix grammar
---
 content/circumvention/contents.lr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/circumvention/contents.lr 
b/content/circumvention/contents.lr
index b1218ee..f0d1cdf 100644
--- a/content/circumvention/contents.lr
+++ b/content/circumvention/contents.lr
@@ -49,9 +49,9 @@ meek
 
 ### USING PLUGGABLE TRANSPORTS
 
-To use a pluggable transport, click "Configure" when starting Tor Browser for 
the first time. After checking the checkbox "Tor is censored in my country," 
choose "Select a built-in bridge" option. From the dropdown, select whichever 
pluggable transport you'd like to use. Once you've selected the pluggable 
transport, click "Connect" to save your settings.
+To use a pluggable transport, click "Configure" when starting Tor Browser for 
the first time. After checking the checkbox "Tor is censored in my country," 
choose the "Select a built-in bridge" option. From the dropdown, select 
whichever pluggable transport you'd like to use. Once you've selected the 
pluggable transport, 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 "Select a built-in bridge", choose 
whichever pluggable transport you'd like to use from the dropdown. 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 "Select a built-in bridge," choose 
whichever pluggable transport you'd like to use from the dropdown. Your setting 
will automatically be saved once you close the tab.
 
 
 ### WHICH TRANSPORT SHOULD I USE?



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Erase repeated instructions

[pili]

commit 6324c0e1fa6c5e68db722fd282fbb3373e1943cd
Author: Nicolei Ocana 
Date:   Tue Mar 31 20:25:23 2020 +

Erase repeated instructions
---
 content/circumvention/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/circumvention/contents.lr 
b/content/circumvention/contents.lr
index 641c23c..dbb9a10 100644
--- a/content/circumvention/contents.lr
+++ b/content/circumvention/contents.lr
@@ -60,6 +60,6 @@ Each of the transports listed in Tor Launcher’s menu works 
in a different way,
 
 If you are trying to circumvent a blocked connection for the first time, you 
should try the different transports: obfs4, snowflake, or meek-azure.
 
-If you try all of these options and none of them gets you online, you can 
choose "Request a bridge from torproject.org" for BridgeDB to provide a bridge 
or "Provide a bridge I know" to manually enter bridge addresses.
+If you try all of these options, and none of them gets you online, you will 
need to request a bridge or to manually enter bridge addresses.
 
 Read the [Bridges](/en-US/bridges/) section to learn what bridges are and how 
to obtain them.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Merge remote-tracking branch 'nicoleiocana/update-circumvention-page#29' into develop

[pili]

commit af815d3bb820af10700084014a3a0a8d1ad6a0a6
Merge: d5ba56b 22816b0
Author: Pili Guerra 
Date:   Thu Apr 2 18:28:40 2020 +0100

Merge remote-tracking branch 'nicoleiocana/update-circumvention-page#29' 
into develop

 content/circumvention/contents.lr | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Clarify 'Preferences' instruction similar to Bridges page

[pili]

commit c43c1dd878b00605264c2a1ea5ba37db809812e1
Author: Nicolei Ocana 
Date:   Wed Apr 1 00:37:19 2020 +

Clarify 'Preferences' instruction similar to Bridges page
---
 content/circumvention/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/circumvention/contents.lr 
b/content/circumvention/contents.lr
index 07b6a89..b1218ee 100644
--- a/content/circumvention/contents.lr
+++ b/content/circumvention/contents.lr
@@ -51,7 +51,7 @@ meek
 
 To use a pluggable transport, click "Configure" when starting Tor Browser for 
the first time. After checking the checkbox "Tor is censored in my country," 
choose "Select a built-in bridge" option. From the dropdown, select whichever 
pluggable transport you'd like to use. Once you've selected the pluggable 
transport, 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 dropdown "Select a built-in bridge", 
choose whichever pluggable transport you'd like to use. 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 "Select a built-in bridge", choose 
whichever pluggable transport you'd like to use from the dropdown. Your setting 
will automatically be saved once you close the tab.
 
 
 ### WHICH TRANSPORT SHOULD I USE?



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Fix Known issues

[pili]

commit ec96930158b42f2142ceddd7dd47bdb3fced4ff9
Author: Nicolei Ocana 
Date:   Mon Mar 30 14:54:00 2020 +

Fix Known issues
---
 databags/topics.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/databags/topics.ini b/databags/topics.ini
index 92e665f..9fc3c67 100644
--- a/databags/topics.ini
+++ b/databags/topics.ini
@@ -60,7 +60,7 @@ label = Troubleshooting
 
 [known-issues]
 path = known-issues
-label = Known issues
+label = Known Issues
 
 [mobile-tor]
 path = mobile-tor



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] translators input, thanks!

[pili]

commit 534754592dd961a4595d8dc6ae0c946d2b66f30d
Author: emma peel 
Date:   Wed Jan 15 15:46:09 2020 +0100

translators input, thanks!
---
 content/plugins/contents.lr   | 2 +-
 content/security-settings/contents.lr | 2 +-
 lego  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/plugins/contents.lr b/content/plugins/contents.lr
index 0801640..b0379dd 100644
--- a/content/plugins/contents.lr
+++ b/content/plugins/contents.lr
@@ -21,7 +21,7 @@ JavaScript is a programming language that websites use to 
offer interactive elem
 
 Tor Browser includes an add-on called NoScript. It's accessible through 
'Preferences' on hamburger menu (main menu), then select 'Customize' and drag 
the “S” icon to the top-right of the window. NoScript allows you to control 
the JavaScript (and other scripts) that runs on individual web pages, or block 
it entirely.
 
-Users who require a high degree of security in their web browsing should set 
Tor Browser’s [Security Slider](/security-slider) to “Safer” (which 
disables JavaScript for non-HTTPS websites) or “Safest” (which does so for 
all websites). However, disabling JavaScript will prevent many websites from 
displaying correctly, so Tor Browser’s default setting is to allow all 
websites to run scripts in "Standard" mode.
+Users who require a high degree of security in their web browsing should set 
Tor Browser’s [Security Level](../security-settings/) to “Safer” (which 
disables JavaScript for non-HTTPS websites) or “Safest” (which does so for 
all websites). However, disabling JavaScript will prevent many websites from 
displaying correctly, so Tor Browser’s default setting is to allow all 
websites to run scripts in "Standard" mode.
 
 ### BROWSER ADD-ONS
 
diff --git a/content/security-settings/contents.lr 
b/content/security-settings/contents.lr
index 09aa940..ade3242 100644
--- a/content/security-settings/contents.lr
+++ b/content/security-settings/contents.lr
@@ -11,7 +11,7 @@ key: 11
 body:
 By default, Tor Browser protects your security by encrypting your browsing 
data.
 You can further increase your security by choosing to disable certain web 
features that can be used to attack your security and anonymity.
-You can do this by increasing Tor Browser's Security Settings in the shield 
menu.
+You can do this by increasing Tor Browser's Security Levels in the shield menu.
 Increasing Tor Browser's security level will stop some web pages from 
functioning properly, so you should weigh your security needs against the 
degree of usability you require.
 
 ### ACCESSING THE SECURITY SETTINGS
diff --git a/lego b/lego
index 620c586..abbf18c 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 620c5866a641f76a8eab06eeb5809b625bcac890
+Subproject commit abbf18cb1bbca70caeb8913d2b60f0cb9332f287



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] layout changes, better link

[pili]

commit 325a0a22cb64de31d73a3269ec6c8ed2250a9648
Author: emma peel 
Date:   Tue Mar 31 16:38:42 2020 +0200

layout changes, better link
---
 content/running-tor-browser/contents.lr | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/content/running-tor-browser/contents.lr 
b/content/running-tor-browser/contents.lr
index 125d1f6..960bc91 100644
--- a/content/running-tor-browser/contents.lr
+++ b/content/running-tor-browser/contents.lr
@@ -19,7 +19,7 @@ This offers you the option to connect directly to the Tor 
network, or to configu
 
 In most cases, choosing "Connect" will allow you to connect to the Tor network 
without any further configuration.
 Once clicked, a status bar will appear, showing Tor’s connection progress.
-If you are on a relatively fast connection, but this bar seems to get stuck at 
a certain point, see the [Troubleshooting](/troubleshooting) page for help 
solving the problem.
+If you are on a relatively fast connection, but this bar seems to get stuck at 
a certain point, see the [Troubleshooting](../troubleshooting) page for help 
solving the problem.
 
 ### CONFIGURE
 
@@ -33,7 +33,10 @@ Tor Browser will take you through a series of configuration 
options.
 
 
 
-The first checkbox asks if access to the Tor network is blocked or censored on 
your connection. If you do not believe this is the case, leave this unchecked. 
If you know your connection is censored, or you have tried and failed to 
connect to the Tor network and no other solutions have worked, check the 
checkbox. This will display the [Circumvention](/circumvention) section to 
configure a pluggable transport.
+The first checkbox asks if access to the Tor network is blocked or censored on 
your connection.
+If you do not believe this is the case, leave this unchecked.
+If you know your connection is censored, or you have tried and failed to 
connect to the Tor network and no other solutions have worked, check the 
checkbox.
+This will display the [Circumvention](../circumvention) section to configure a 
pluggable transport.
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Merge remote-tracking branch 'nicoleiocana/fix-sidebar-topics-punctuation#28'

[pili]

commit 61415a7b24416ae4a0ccde8b6659a37e5fbbcb65
Merge: 325a0a2 ec96930
Author: emma peel 
Date:   Tue Mar 31 16:41:46 2020 +0200

Merge remote-tracking branch 
'nicoleiocana/fix-sidebar-topics-punctuation#28'

 databags/topics.ini | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Update the Running Tor Browser for the First Time configure section

[pili]

commit c91cf89bbe3b05c9e8c68b20fe05c812652f7f32
Author: Nicolei Ocana 
Date:   Mon Mar 30 14:18:01 2020 +

Update the Running Tor Browser for the First Time configure section
---
 assets/static/images/pluggable-transport.png | Bin 0 -> 17010 bytes
 content/running-tor-browser/contents.lr  |  12 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/assets/static/images/pluggable-transport.png 
b/assets/static/images/pluggable-transport.png
new file mode 100644
index 000..ff44ba8
Binary files /dev/null and b/assets/static/images/pluggable-transport.png differ
diff --git a/content/running-tor-browser/contents.lr 
b/content/running-tor-browser/contents.lr
index 92eb10e..125d1f6 100644
--- a/content/running-tor-browser/contents.lr
+++ b/content/running-tor-browser/contents.lr
@@ -25,12 +25,16 @@ If you are on a relatively fast connection, but this bar 
seems to get stuck at a
 
 
 
-If you know that your connection is censored, or uses a proxy, you should 
select this option. Tor Browser will take you through a series of configuration 
options.
+If you know that your connection is censored or uses a proxy, you should 
select this option.
 
-The first screen asks if access to the Tor network is blocked or censored on 
your connection. If you do not believe this is the case, select “No”. If 
you know your connection is censored, or you have tried and failed to connect 
to the Tor network and no other solutions have worked, select “Yes”. You 
will then be taken to the [Circumvention](/circumvention) screen to configure a 
pluggable transport.
+
 
-The next screen asks if your connection uses a proxy. In most cases, this is 
not necessary. You will usually know if you need to answer “Yes”, as the 
same settings will be used for other browsers on your system. If possible, ask 
your network administrator for guidance. If your connection does not use a 
proxy, click “Continue”.
+Tor Browser will take you through a series of configuration options.
 
-
+
+
+The first checkbox asks if access to the Tor network is blocked or censored on 
your connection. If you do not believe this is the case, leave this unchecked. 
If you know your connection is censored, or you have tried and failed to 
connect to the Tor network and no other solutions have worked, check the 
checkbox. This will display the [Circumvention](/circumvention) section to 
configure a pluggable transport.
 
 
+
+The second checkbox asks if your connection uses a proxy. In most cases, this 
is not necessary. You will usually know if you need to check this checkbox 
because the same settings will be used for other browsers on your system. If 
possible, ask your network administrator for guidance. If your connection does 
not use a proxy, click “Connect”.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Merge master

[pili]

commit d5ba56ba13eaabbcff65e8a3c24cbacaa51c9312
Merge: 2c3a721 61415a7
Author: Pili Guerra 
Date:   Thu Apr 2 18:26:58 2020 +0100

Merge master

 assets/static/images/bridges-dark-tb90.png   | Bin 0 -> 839754 bytes
 assets/static/images/bridges-light-tb90.png  | Bin 0 -> 840100 bytes
 assets/static/images/pluggable-transport.png | Bin 0 -> 17010 bytes
 content/mobile-tor/contents.lr   |  11 +++
 content/plugins/contents.lr  |   2 +-
 content/running-tor-browser/contents.lr  |  17 -
 content/security-settings/contents.lr|   2 +-
 databags/topics.ini  |  12 
 8 files changed, 29 insertions(+), 15 deletions(-)

diff --cc databags/topics.ini
index e960880,9fc3c67..ce0a4d5
--- a/databags/topics.ini
+++ b/databags/topics.ini
@@@ -60,8 -60,12 +60,12 @@@ label = Troubleshootin
  
  [known-issues]
  path = known-issues
- label = Known issues
+ label = Known Issues
+ 
+ [mobile-tor]
+ path = mobile-tor
+ label = Mobile Tor
  
 -[becoming-tor-translator]
 -path = becoming-tor-translator
 -label = Becoming a Tor Translator
 +[mobile-tor]
 +path = mobile-tor
 +label = Mobile Tor

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Fix sidebar topics punctuation

[pili]

commit ce046e8d10a042f76b6797dfdfc16a0ff6ff0104
Author: Nicolei Ocana 
Date:   Mon Mar 30 14:39:38 2020 +

Fix sidebar topics punctuation
---
 databags/topics.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/databags/topics.ini b/databags/topics.ini
index ee6ac4b..92e665f 100644
--- a/databags/topics.ini
+++ b/databags/topics.ini
@@ -12,7 +12,7 @@ label = Installation
 
 [running-tor-browser]
 path = running-tor-browser
-label = Running Tor Browser for the first time
+label = Running Tor Browser for the First Time
 
 [circumvention]
 path = circumvention
@@ -24,7 +24,7 @@ label = Bridges
 
 [managing-identities]
 path = managing-identities
-label = Managing identities
+label = Managing Identities
 
 [secure-connections]
 path = secure-connections
@@ -52,7 +52,7 @@ label = Uninstalling
 
 [make-tor-portable]
 path = make-tor-portable
-label = Making Tor Browser portable
+label = Making Tor Browser Portable
 
 [troubleshooting]
 path = troubleshooting



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [manual/develop] Add Tor Browser about:preferences#network bridges screenshots

[pili]

commit 73222895b0574f92d2095758ad7e5c0df7f3
Author: Antonela 
Date:   Wed Mar 25 10:02:15 2020 -0300

Add Tor Browser about:preferences#network bridges screenshots
---
 assets/static/images/bridges-dark-tb90.png  | Bin 0 -> 839754 bytes
 assets/static/images/bridges-light-tb90.png | Bin 0 -> 840100 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/static/images/bridges-dark-tb90.png 
b/assets/static/images/bridges-dark-tb90.png
new file mode 100644
index 000..44e9edc
Binary files /dev/null and b/assets/static/images/bridges-dark-tb90.png differ
diff --git a/assets/static/images/bridges-light-tb90.png 
b/assets/static/images/bridges-light-tb90.png
new file mode 100644
index 000..d078473
Binary files /dev/null and b/assets/static/images/bridges-light-tb90.png differ



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Uploading better icon for globaleaks to fix alignment issues

[pili]

commit 26a4957572a743797f35b1c6b108fc84b59272f3
Author: Pili Guerra 
Date:   Thu Apr 2 16:56:34 2020 +0100

Uploading better icon for globaleaks to fix alignment issues
---
 assets/static/images/onions/png/globaleaks.png | Bin 10428 -> 52806 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/static/images/onions/png/globaleaks.png 
b/assets/static/images/onions/png/globaleaks.png
index e622c9b..d743c43 100644
Binary files a/assets/static/images/onions/png/globaleaks.png and 
b/assets/static/images/onions/png/globaleaks.png differ

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Use png for globaleaks

[pili]

commit 7e6929beee19df04d2e4a5059c0c9fb2fdfad17b
Author: Pili Guerra 
Date:   Wed Mar 25 17:10:41 2020 +

Use png for globaleaks
---
 assets/static/images/onions/png/globaleaks.png | Bin 0 -> 10428 bytes
 databags/onion-tools.ini   |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/static/images/onions/png/globaleaks.png 
b/assets/static/images/onions/png/globaleaks.png
new file mode 100644
index 000..e622c9b
Binary files /dev/null and b/assets/static/images/onions/png/globaleaks.png 
differ
diff --git a/databags/onion-tools.ini b/databags/onion-tools.ini
index 6eff5af..6e001bf 100644
--- a/databags/onion-tools.ini
+++ b/databags/onion-tools.ini
@@ -12,6 +12,6 @@ active = True
 
 [globaleaks]
 link = https://www.globaleaks.org/
-image =/static/images/onions/svg/globaleaks.svg
+image =/static/images/onions/svg/globaleaks.png
 label= GlobaLeaks 
 active = True



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Improve Tools image sizes and placement

[pili]

commit 0c75dd16a98bf4e3e9e1605b84756282b7973deb
Author: Pili Guerra 
Date:   Wed Mar 25 17:27:21 2020 +

Improve Tools image sizes and placement
---
 databags/onion-tools.ini  | 2 +-
 templates/onion-services.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/databags/onion-tools.ini b/databags/onion-tools.ini
index 6e001bf..d37dc3b 100644
--- a/databags/onion-tools.ini
+++ b/databags/onion-tools.ini
@@ -12,6 +12,6 @@ active = True
 
 [globaleaks]
 link = https://www.globaleaks.org/
-image =/static/images/onions/svg/globaleaks.png
+image =/static/images/onions/png/globaleaks.png
 label= GlobaLeaks 
 active = True
diff --git a/templates/onion-services.html b/templates/onion-services.html
index d726742..2362213 100644
--- a/templates/onion-services.html
+++ b/templates/onion-services.html
@@ -54,14 +54,14 @@
   
 {{ _('Tools') 
}}
   
-  
+  
 {% for id, item in bag('onion-tools').items() %}
 {% if item.active == "True" %}
   
 
-  
+  
   
-  {{ item.label }}
+{{ item.label }}
   
 
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Add Tools section to Onion Services landing page. Fixes #66.

[pili]

commit f1d6716ff599e89033ae6fee7972ff27d8c3bdc6
Author: Pili Guerra 
Date:   Mon Mar 23 17:18:36 2020 +

Add Tools section to Onion Services landing page. Fixes #66.
---
 assets/static/images/onions/png/onionshare.png | Bin 0 -> 16103 bytes
 assets/static/images/onions/png/securedrop.png | Bin 0 -> 17483 bytes
 assets/static/images/onions/svg/globaleaks.svg |   3 +++
 databags/onion-tools.ini   |  17 +
 templates/onion-services.html  |  17 +
 5 files changed, 37 insertions(+)

diff --git a/assets/static/images/onions/png/onionshare.png 
b/assets/static/images/onions/png/onionshare.png
new file mode 100644
index 000..e2948b0
Binary files /dev/null and b/assets/static/images/onions/png/onionshare.png 
differ
diff --git a/assets/static/images/onions/png/securedrop.png 
b/assets/static/images/onions/png/securedrop.png
new file mode 100644
index 000..55f9b01
Binary files /dev/null and b/assets/static/images/onions/png/securedrop.png 
differ
diff --git a/assets/static/images/onions/svg/globaleaks.svg 
b/assets/static/images/onions/svg/globaleaks.svg
new file mode 100644
index 000..ca9095f
--- /dev/null
+++ b/assets/static/images/onions/svg/globaleaks.svg
@@ -0,0 +1,3 @@
+
+
+http://purl.org/dc/elements/1.1/; 
xmlns:cc="http://creativecommons.org/ns#; 
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; 
xmlns:svg="http://www.w3.org/2000/svg; xmlns="http://www.w3.org/2000/svg; 
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; 
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; id="svg2" 
version="1.1" inkscape:version="0.91 r13725" xml:space="preserve" 
width="974.03241" height="904.7312" viewBox="0 0 974.03241 904.7312" 
sodipodi:docname="GlobaLeaks.svg">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"/>
\ No newline at end of file
diff --git a/databags/onion-tools.ini b/databags/onion-tools.ini
new file mode 100644
index 000..6eff5af
--- /dev/null
+++ b/databags/onion-tools.ini
@@ -0,0 +1,17 @@
+[onionshare]
+link = https://onionshare.org/
+image = /static/images/onions/png/onionshare.png
+label = OnionShare
+active = True
+
+[securedrop]
+link = https://securedrop.org
+image = /static/images/onions/png/securedrop.png
+label = SecureDrop
+active = True
+
+[globaleaks]
+link = https://www.globaleaks.org/
+image =/static/images/onions/svg/globaleaks.svg
+label= GlobaLeaks 
+active = True
diff --git a/templates/onion-services.html b/templates/onion-services.html
index a4a7ed6..d726742 100644
--- a/templates/onion-services.html
+++ b/templates/onion-services.html
@@ -51,6 +51,23 @@
   
 {% endfor %}
   
+  
+{{ _('Tools') 
}}
+  
+  
+{% for id, item in bag('onion-tools').items() %}
+{% if item.active == "True" %}
+  
+
+  
+  
+  {{ item.label }}
+  
+
+  
+  {% endif %}
+{% endfor %}
+  
 
 {{ _('Learn 
More') }}
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/master] Update ooni links to the canonical ones

[pili]

commit e083df93caa04586f5079f5b4b0616a72306e497
Author: Arturo Filastò 
Date:   Mon Mar 23 17:33:45 2020 +0100

Update ooni links to the canonical ones

related to: https://trac.torproject.org/projects/tor/ticket/31718
---
 content/about/jobs/backend-engineer-ooni/contents.lr | 4 ++--
 content/about/people/agrabeli/contents.lr| 2 +-
 content/about/people/hellais/contents.lr | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/about/jobs/backend-engineer-ooni/contents.lr 
b/content/about/jobs/backend-engineer-ooni/contents.lr
index 21772ed..eaf4eca 100644
--- a/content/about/jobs/backend-engineer-ooni/contents.lr
+++ b/content/about/jobs/backend-engineer-ooni/contents.lr
@@ -13,7 +13,7 @@ title: Backend Engineer for OONI
 color: primary
 ---
 summary:
-The Tor Project, Inc. is looking for a dedicated backend engineer to work on 
OONI (https://ooni.torproject.org/). OONI is the Open Observatory of Network 
Interference: a free and open source software, global observation network for 
detecting censorship, surveillance, and traffic manipulation on the internet.
+The Tor Project, Inc. is looking for a dedicated backend engineer to work on 
OONI (https://ooni.org/). OONI is the Open Observatory of Network Interference: 
a free and open source software, global observation network for detecting 
censorship, surveillance, and traffic manipulation on the internet.
 
 You will be working to improve OONI's data processing pipeline and other 
backend components responsible for recording measurements collected from our 
growing global user network. You will also be tasked with improving our network 
measurement methodologies and data analysis heuristics to increase the accuracy 
of our experiments.
 
@@ -23,7 +23,7 @@ description:
 ## Backend Engineer for OONI
 *January 31, 2018*
 
-The Tor Project, Inc. is looking for a dedicated backend engineer to work on 
OONI (https://ooni.torproject.org/). OONI is the Open Observatory of Network 
Interference: a free and open source software, global observation network for 
detecting censorship, surveillance, and traffic manipulation on the internet.
+The Tor Project, Inc. is looking for a dedicated backend engineer to work on 
OONI (https://ooni.org/). OONI is the Open Observatory of Network Interference: 
a free and open source software, global observation network for detecting 
censorship, surveillance, and traffic manipulation on the internet.
 
 You will be working to improve OONI's data processing pipeline and other 
backend components responsible for recording measurements collected from our 
growing global user network. You will also be tasked with improving our network 
measurement methodologies and data analysis heuristics to increase the accuracy 
of our experiments.
 
diff --git a/content/about/people/agrabeli/contents.lr 
b/content/about/people/agrabeli/contents.lr
index 57e7e75..e1fe856 100644
--- a/content/about/people/agrabeli/contents.lr
+++ b/content/about/people/agrabeli/contents.lr
@@ -18,4 +18,4 @@ image: /static/images/people/agrabeli.png
 ---
 description:
 
-Maria manages OONI's Partnership Program and writes research reports on 
internet censorship around the world.
+Maria manages [OONI's Partnership 
Program](https://ooni.org/get-involved/partnership-program/) and writes 
research reports on [internet censorship around the 
world](https://ooni.org/reports/).
diff --git a/content/about/people/hellais/contents.lr 
b/content/about/people/hellais/contents.lr
index 65264b7..e51eb37 100644
--- a/content/about/people/hellais/contents.lr
+++ b/content/about/people/hellais/contents.lr
@@ -16,4 +16,4 @@ image: /static/images/people/hellais.png
 ---
 description:
 
-Project leader for [OONI](https://ooni.torproject.org/), has helped with 
[tor2web](https://www.tor2web.org/), wrote Atlas which later became [Relay 
Search](https://metrics.torproject.org/rs.html), and helps improve security.
+Project leader for [OONI](https://ooni.org/), has helped with 
[tor2web](https://www.tor2web.org/), wrote Atlas which later became [Relay 
Search](https://metrics.torproject.org/rs.html), and helps improve security.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Update the OONI related GSoC proposals

[pili]

commit 9a126f1fc3924b8f151d1ea37fc9e2db0717e1fe
Author: Arturo Filastò 
Date:   Fri Mar 20 17:44:07 2020 +0100

Update the OONI related GSoC proposals
---
 .../gsoc/ooni-explorer-advanced-search/contents.lr | 61 -
 content/gsoc/ooni-explorer-findings/contents.lr| 78 ++
 content/gsoc/ooni-explorer-testing/contents.lr | 53 +++
 .../ooni-probe-desktop-custom-urls/contents.lr | 72 
 4 files changed, 203 insertions(+), 61 deletions(-)

diff --git a/content/gsoc/ooni-explorer-advanced-search/contents.lr 
b/content/gsoc/ooni-explorer-advanced-search/contents.lr
deleted file mode 100644
index be381fd..000
--- a/content/gsoc/ooni-explorer-advanced-search/contents.lr
+++ /dev/null
@@ -1,61 +0,0 @@
-_model: project

-_template: layout.html

-html: two-columns-page.html

-active: True

-section: GSoC

-section_id: gsoc

-color: primary

-key: 4

-languages: React

-org: OONI

-mentors:
-Federico Ceratto
-Arturo Filastò

-difficulty: Medium

-title: OONI Explorer Advanced Search

-subtitle:
-
-OONI Explorer is an open data resource on internet censorship around the 
world. This project is about enriching the OONI Explorer search functionality 
with the ability to visualize an analysis of metadata pertaining to filtered 
measurements.

-body:
-
-# Background
-
-OONI Explorer is an open data resource on internet censorship around the 
world. This project is about enriching the OONI Explorer search functionality 
with the ability to visualize an analysis of metadata pertaining to filtered 
measurements.
-
-# Proposal
-
-This project is about enriching the OONI Explorer search functionality with 
the ability to visualize an analysis of metadata pertaining to filtered 
measurements.
-
-This would involve adding the ability to filter on multiple axis: country, 
ASN, time range, anomaly, confirmed, failure, domain or input, citizenlab 
category code.
-
-The results would then be presented in an aggregate form, such as showing:
-
-- The total measurement count
-- The anomaly vs total ratio
-- Confirmed vs total
-- Failure vs total
-
-These results could then be presented as a table or some other charts, such as 
a heatmat.
-
-Some other more detailed, drill-down views could also be implemented.
-
-A potential applicant should also have some prior design experience
-
-# Resources
-
-- OONI Explorer repo on github: https://github.com/ooni/explorer
-
diff --git a/content/gsoc/ooni-explorer-findings/contents.lr 
b/content/gsoc/ooni-explorer-findings/contents.lr
new file mode 100644
index 000..270ccd4
--- /dev/null
+++ b/content/gsoc/ooni-explorer-findings/contents.lr
@@ -0,0 +1,78 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 4
+---
+languages: React
+---
+org: OONI
+---
+mentors:
+Sarath
+Federico Ceratto
+Arturo Filastò
+---
+difficulty: Medium
+---
+title: OONI Explorer findings: Improvements related to social media sharing
+---
+subtitle:
+
+OONI Explorer is an open data resource on internet censorship around the world.
+OONI Probe is the software used to collect network measurements which are then
+shown on OONI Explorer.  This project is about making improvements to how
+findings from OONI Probe tests are displayed on OONI Explorer when shared on
+social media.
+
+---
+body:
+
+# Background
+
+OONI Explorer is an open data resource on internet censorship around the world.
+OONI Probe is the software used to collect network measurements which are then
+shown on OONI Explorer.  This project is about making improvements to how
+findings from OONI Probe tests are displayed on OONI Explorer when shared on
+social media.
+
+# Proposal
+
+Currently, when an OONI Probe user wants to share their network measurement 
findings from their mobile app, the only option they have is to take 
screenshots and to share them on social media.
+
+As part of this activity, the student is asked to improve how OONI 
measurements are displayed when they are shared on social media.
+
+This includes:
+* Setting the appropriate meta tags to measurement page headers: 
https://github.com/ooni/explorer/issues/202
+* Generating a screenshot preview to display on the various social media 
platforms
+* Validating that the measurements are displayed well
+* Improving the indexing of OONI Explorer by search engines: 
https://github.com/ooni/ooni.org/issues/328
+* Adding some Call to Action functionality to encourage users to install OONI 
Probe
+
+Moreover, the student is encouraged to explore other ways through which OONI
+Probe users may be interested in sharing findings (such as a measurement result
+set) and how these can be presented in OONI Explorer and embedded in social
+media.
+
+Other relevant github issues include:
+
+Add support for native sharing capability in OONI Probe

[tor-commits] [community/master] Updating papers for salmon gsoc project

[pili]

commit fb66b21ee1514ad7e74b33749edd360536ff54df
Author: Pili Guerra 
Date:   Fri Mar 20 16:32:04 2020 +

Updating papers for salmon gsoc project
---
 content/gsoc/salmon-bridge-distribution/contents.lr | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/content/gsoc/salmon-bridge-distribution/contents.lr 
b/content/gsoc/salmon-bridge-distribution/contents.lr
index fb9e7ab..99a5bbf 100644
--- a/content/gsoc/salmon-bridge-distribution/contents.lr
+++ b/content/gsoc/salmon-bridge-distribution/contents.lr
@@ -56,7 +56,9 @@ Our goal is to distribute bridges to users in censored 
regions when they need th
 
 - Original Paper: [Salmon: Robust Proxy Distribution for Censorship 
Circumvention](https://petsymposium.org/2016/files/papers/Salmon__Robust_Proxy_Distribution_for_Censorship_Circumvention.pdf)
 - [Design of a blocking-resistant anonymity 
system](https://svn-archive.torproject.org/svn/projects/design-paper/blocking.html)
-- [Nymble: Blocking Misbehaving Users in Anonymizing 
Networks](https://www.freehaven.net/anonbib/#proximax11)
+- [Enemy At the Gateways: Censorship-Resilient Proxy Distribution Using Game 
Theory](https://people.cs.umass.edu/~amir/papers/TorGame.pdf)
+- [rBridge: User Reputation based Tor Bridge Distribution with Privacy 
Preservation](https://www-users.cs.umn.edu/~hoppernj/rbridge_ndss13.pdf)
+- [HYPHAE: Social Secret 
Sharing](https://patternsinthevoid.net/hyphae/hyphae.pdf)
 
 ## Blog posts
 - [Strategies for getting more bridge 
addresses](https://blog.torproject.org/strategies-getting-more-bridge-addresses)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Adding more details to the Salmon gsoc project

[pili]

commit e0b892e569c4f5c5c905d6dc4c37683e4689087b
Author: Pili Guerra 
Date:   Fri Mar 20 16:01:15 2020 +

Adding more details to the Salmon gsoc project
---
 .../gsoc/salmon-bridge-distribution/contents.lr| 28 +++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/content/gsoc/salmon-bridge-distribution/contents.lr 
b/content/gsoc/salmon-bridge-distribution/contents.lr
index 8ec5614..fb9e7ab 100644
--- a/content/gsoc/salmon-bridge-distribution/contents.lr
+++ b/content/gsoc/salmon-bridge-distribution/contents.lr
@@ -15,6 +15,7 @@ color: primary
 key: 8
 ---
 languages: 
+Python
 ---
 org: Tor
 ---
@@ -41,8 +42,29 @@ Bridges are Tor relays that are not publicly listed and 
therefore allow access t
 
 Our goal is to distribute bridges to users in censored regions when they need 
them, while also limiting the amount of bridge information that is leaked to 
censors. This project entails implementing Salmon, a bridge distribution 
mechanism that partitions and distributes bridges using reputation to give 
well-behaved users access to "better" bridges and add a penalty when their 
bridges get censored.
 
+# Getting started
+
+1. Read the blog posts to get an introduction to the problem space.
+1. Play around with [bridgedb](https://bridges.torproject.org/) to request a 
bridge and try understand how it works.
+1. Checkout the existing [code](#Code-repos).
+1. Read the [papers](#academic-papers) listed under [Resources](#Resources).
+1. Join the [next anti-censorship team 
meeting](https://trac.torproject.org/projects/tor/wiki/org/teams/AntiCensorshipTeam#IRCmeetingsschedule)
 to discuss your findings and ask any questions.
+
 # Resources
 
-- Original Paper: [Salmon: Robust Proxy Distribution for
-Censorship 
Circumvention](https://petsymposium.org/2016/files/papers/Salmon__Robust_Proxy_Distribution_for_Censorship_Circumvention.pdf)
-- Salmon Project on github: https://github.com/SalmonProject
\ No newline at end of file
+## Academic papers
+
+- Original Paper: [Salmon: Robust Proxy Distribution for Censorship 
Circumvention](https://petsymposium.org/2016/files/papers/Salmon__Robust_Proxy_Distribution_for_Censorship_Circumvention.pdf)
+- [Design of a blocking-resistant anonymity 
system](https://svn-archive.torproject.org/svn/projects/design-paper/blocking.html)
+- [Nymble: Blocking Misbehaving Users in Anonymizing 
Networks](https://www.freehaven.net/anonbib/#proximax11)
+
+## Blog posts
+- [Strategies for getting more bridge 
addresses](https://blog.torproject.org/strategies-getting-more-bridge-addresses)
+- [Ten ways to discover Tor 
bridges](https://blog.torproject.org/research-problems-ten-ways-discover-tor-bridges)
+- [Five ways to test bridge 
reachability](https://blog.torproject.org/research-problem-five-ways-test-bridge-reachability)
+- [The Next Chapter in 
Anti-Censorship](https://blog.torproject.org/next-chapter-anti-censorship)
+
+## Code repos
+
+- Salmon Project on github: https://github.com/SalmonProject
+- BridgeDB Source code: https://gitweb.torproject.org/bridgedb.git

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/master] We are in the final stages of interviewing

[pili]

commit 1e42acaa92f5df3e7240ac11a6445ea2a8cac8d3
Author: Pili Guerra 
Date:   Tue Mar 10 09:59:00 2020 +0100

We are in the final stages of interviewing
---
 content/about/jobs/executive-assistant/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/jobs/executive-assistant/contents.lr 
b/content/about/jobs/executive-assistant/contents.lr
index 66b3522..facaf46 100644
--- a/content/about/jobs/executive-assistant/contents.lr
+++ b/content/about/jobs/executive-assistant/contents.lr
@@ -6,7 +6,7 @@ section: about
 ---
 section_id: about
 ---
-active: True
+active: False
 ---
 title: Executive Assistant
 ---

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Add task links to IPv6 project

[pili]

commit 4b5db4e993c589543820eef07731f621b3e205ca
Author: Pili Guerra 
Date:   Mon Mar 9 15:14:55 2020 +0100

Add task links to IPv6 project
---
 content/gsoc/tor-relay-ipv6-support/contents.lr | 25 +
 1 file changed, 25 insertions(+)

diff --git a/content/gsoc/tor-relay-ipv6-support/contents.lr 
b/content/gsoc/tor-relay-ipv6-support/contents.lr
index e94d0b7..d28a631 100644
--- a/content/gsoc/tor-relay-ipv6-support/contents.lr
+++ b/content/gsoc/tor-relay-ipv6-support/contents.lr
@@ -72,6 +72,31 @@ Recommended:
 
 See our [Getting 
Started](https://gitweb.torproject.org/tor.git/tree/doc/HACKING/GettingStarted.md)
 document for more information.
 
+Once you have completed the above tasks, you may wish to move on to the 
following initial tasks for the project.
+
+### Initial Tasks
+
+* [Use Authority Addresses for Socket-Based Address 
Detection](https://gitweb.torproject.org/torspec.git/tree/proposals/312-relay-auto-ipv6-addr.txt#n1397).
+* [Add IPv6 Support to 
is_local_addr()](https://gitweb.torproject.org/torspec.git/tree/proposals/312-relay-auto-ipv6-addr.txt#n1099).
+* [Add a BandwidthStatistics 
option](https://gitweb.torproject.org/torspec.git/tree/proposals/313-relay-ipv6-stats.txt#n298).
+* [Close Existing Connections Before Testing 
Reachability](https://gitweb.torproject.org/torspec.git/tree/proposals/311-relay-ipv6-reachability.txt#n465).
+* [Add unit tests or chutney tests for 
IPv6Traffic](https://trac.torproject.org/projects/tor/ticket/31543).
+
+### Main Tasks
+
+* [Add IPv6 Support to 
AuthDirMaxServersPerAddr](https://gitweb.torproject.org/torspec.git/tree/proposals/312-relay-auto-ipv6-addr.txt#n1125).
+* [Use Authenticated NETINFO Cells to Discover Relay IP 
Addresses](https://gitweb.torproject.org/torspec.git/tree/proposals/312-relay-auto-ipv6-addr.txt#n785).
+* [Chutney tests for IPv6-only bridge 
clients](https://trac.torproject.org/projects/tor/ticket/20068).
+* [IPv6 Exits succeed on Travis Linux, but Travis Linux doesn't support 
IPv6](https://trac.torproject.org/projects/tor/ticket/30182).
+
+### Stretch Goals
+
+* [Close Existing Connections Before Testing 
Reachability](https://gitweb.torproject.org/torspec.git/tree/proposals/311-relay-ipv6-reachability.txt#n465).
+* [Use Add IPv6 DNS Support via the Libevent DNS 
API](https://gitweb.torproject.org/torspec.git/tree/proposals/312-relay-auto-ipv6-addr.txt#n1189).
 
+* [Discovered Addresses as the Default 
OutboundBindAddress](https://gitweb.torproject.org/torspec.git/tree/proposals/312-relay-auto-ipv6-addr.txt#n1256).
+* [Make chutney check for relay microdescriptors before 
verifying](https://trac.torproject.org/projects/tor/ticket/33428).
+* [chutney doesn't verify using IPv6 
addresses](https://trac.torproject.org/projects/tor/ticket/17011).
+
 ## Links/Resources
 
 ### Technical Proposals

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Adding Getting Started section for ipv6 project

[pili]

commit d8ebc74f779e08f176fa7fd7180ec2600bc037ff
Author: Pili Guerra 
Date:   Thu Mar 5 12:25:14 2020 +0100

Adding Getting Started section for ipv6 project
---
 content/gsoc/tor-relay-ipv6-support/contents.lr | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/content/gsoc/tor-relay-ipv6-support/contents.lr 
b/content/gsoc/tor-relay-ipv6-support/contents.lr
index fdc3f78..e94d0b7 100644
--- a/content/gsoc/tor-relay-ipv6-support/contents.lr
+++ b/content/gsoc/tor-relay-ipv6-support/contents.lr
@@ -61,6 +61,17 @@ Recommended:
 * Python coding (for testing)
 * Access to a server with public IPv4 and IPv6 addresses (to run a test relay)
 
+## Getting Started
+
+1. Clone tor using [git](https://github.com/torproject/tor)
+2. Build tor from source
+3. Run the tor unit tests using "make check". Let us know if they fail, and 
we'll help fix them.
+4. Clone [chutney]( https://github.com/torproject/chutney) using git. Chutney 
is a tor integration test tool.
+5. Run the tor integration tests using "make test-network". Let us know if 
they fail, and we'll help fix them.
+6. Make sure you have a GitHub account, so you can submit pull requests to 
tor's [GitHub repository](https://github.com/torproject/tor)
+
+See our [Getting 
Started](https://gitweb.torproject.org/tor.git/tree/doc/HACKING/GettingStarted.md)
 document for more information.
+
 ## Links/Resources
 
 ### Technical Proposals

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Add some tips for students on how to contribute

[pili]

commit 677d5451ef28fa5a46cb0641640f1c057f035522
Author: Pili Guerra 
Date:   Mon Mar 2 17:38:45 2020 +0100

Add some tips for students on how to contribute
---
 content/gsoc/cloudflare-captcha-monitoring/contents.lr | 8 
 1 file changed, 8 insertions(+)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr 
b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
index c311934..f511683 100644
--- a/content/gsoc/cloudflare-captcha-monitoring/contents.lr
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -60,6 +60,14 @@ Then there are other interesting patterns to look for:
 - Is whether you get a CAPTCHA much more probabilistic and transient?
 - Does that pattern change over time?
 
+# Getting Started
+
+As this is a new project, in order to demonstrate your skills and familiarise 
yourself with this project you may want to:
+
+1. Set up the required infrastructure for this project e.g by setting up a 
very simple static webpage to be fronted by Cloudflare.
+2. Familiarise yourself and start experimenting with various web clients to 
fetch pages via Tor, bearing in mind you may need to adapt them to your needs 
if they are lacking the required functionality.
+3. Read the comments in ticket 
[#33010](https://trac.torproject.org/projects/tor/ticket/33010) for more ideas.
+
 # Resources
 
 There is pre-existing research by the Berkeley ICSI group which includes these 
sorts of checks:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Add more details + Getting started to Snowflake Android proxy project

[pili]

commit cc392a7d8a0b850c4710a026044d2c216c984cf2
Author: Pili Guerra 
Date:   Mon Mar 2 18:04:15 2020 +0100

Add more details + Getting started to Snowflake Android proxy project
---
 content/gsoc/snowflake-android-proxy/contents.lr | 23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/content/gsoc/snowflake-android-proxy/contents.lr 
b/content/gsoc/snowflake-android-proxy/contents.lr
index f922efb..f1a8906 100644
--- a/content/gsoc/snowflake-android-proxy/contents.lr
+++ b/content/gsoc/snowflake-android-proxy/contents.lr
@@ -39,9 +39,30 @@ body:
 
 # Proposal
 
-This project entails implementing a Snowflake proxy app that will run on 
Android and relay a user's Tor traffic to the Tor network in the background. 
There is an implementation component as well as an exploration and testing 
component while we figure out how to achieve good performance from a background 
application without using too much of the volunteer proxy's data or resources.
+This project entails implementing a Snowflake proxy app that will run on 
Android and relay a user's Tor traffic to the Tor network in the background. 
This application does not use Tor itself, it will relay Tor traffic from 
censored users to the Snowflake bridge. It will do this by copying Tor traffic 
between a WebRTC connection to the user and a WebSocket connection to the 
Snowflake bridge.
+
+There is an implementation component as well as an exploration and testing 
component while we figure out how to achieve good performance from a background 
application without using too much of the volunteer proxy's data or resources. 
We'd like to build in the ability for multiple users to connect through
+a proxy, but we'll start with just one user at first. This project is 
experimental in the sense that we don't yet know how many resources it will 
take and whether the proxies will be reliable enough for clients to use.
+
+# Getting Started
+
+A good way to get started is to read the resources provided below and 
familiarize yourself with how Snowflake works. You can then:
+
+1. Take a look at the existing WebExtension proxy code, and
+2. Install the WebExtension to try it out for yourself: 
https://snowflake.torproject.org/
+
+Once you feel ready to get started on some tickets, you can search for 
webextension (proxy) based tickets on our bug tracking system by looking for 
the keyword 
["webextension"](https://trac.torproject.org/projects/tor/query?status=accepted=assigned=needs_information=needs_revision=new=reopened=~webextension=%5ECircumvention%2FSnowflake=type=id=summary=component=status=type=priority=milestone=priority)
 in the Snowflake component.
 
 # Resources
 
+We already have the proxy implemented as a WebExtension in javascript. You can 
take a look at that implementation for a more detailed idea of what exactly 
we're trying to do:
+
+- https://gitweb.torproject.org/pluggable-transports/snowflake.git/tree/proxy
+
+Some other links that will be useful are:
+
+- the technical writeup: https://keroserene.net/snowflake/technical/
+- deployment details and open tickets: 
https://trac.torproject.org/projects/tor/wiki/doc/Snowflake
+
 - [Snowflake](https://snowflake.torproject.org/)
 - Snowflake repo: 
https://gitweb.torproject.org/pluggable-transports/snowflake.git/
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/staging] Add more details + Getting started to Snowflake Android proxy project

[pili]

commit 40ab8bf923c8aab9c1241b67bee429e6bbea8f8e
Author: Pili Guerra 
Date:   Mon Mar 2 18:04:15 2020 +0100

Add more details + Getting started to Snowflake Android proxy project
---
 content/gsoc/snowflake-android-proxy/contents.lr | 68 
 1 file changed, 68 insertions(+)

diff --git a/content/gsoc/snowflake-android-proxy/contents.lr 
b/content/gsoc/snowflake-android-proxy/contents.lr
new file mode 100644
index 000..0de37aa
--- /dev/null
+++ b/content/gsoc/snowflake-android-proxy/contents.lr
@@ -0,0 +1,68 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 9
+---
+languages: 
+Android
+---
+org: Tor
+---
+mentors:
+cohosh
+---
+difficulty: 
+---
+title: Snowflake proxy on Android
+---
+subtitle:
+
+This project entails implementing a Snowflake proxy app that will run on 
Android and relay a user's Tor traffic to the Tor network in the background. 
+
+---
+body:
+
+# Background
+
+[Snowflake](https://snowflake.torproject.org/) is a circumvention system in 
which volunteers can run proxies to help users connect to the Tor network. 
Users make WebRTC connections to the proxies, who then relay this data to a 
Snowflake bridge and then on to the Tor network. The advantage of using WebRTC 
is that Snowflake proxies can frequently change IP address or operate behind a 
NAT. At the moment, we have implemented the Snowflake proxy code as a web 
extension or a web badge, but we have not yet implemented a proxy that will run 
smoothly on Android.
+
+# Proposal
+
+This project entails implementing a Snowflake proxy app that will run on 
Android and relay a user's Tor traffic to the Tor network in the background. 
This application should allow Android users to be Snowflake *proxies*. This 
application doesn't even need to use Tor at all, it will be relaying Tor 
traffic but all it needs to do is copy it from a WebRTC connection with the 
client to a WebSocket connection with the bridge.
+
+There is an implementation component as well as an exploration and testing 
component while we figure out how to achieve good performance from a background 
application without using too much of the volunteer proxy's data or resources. 
We'd like to build in the ability for multiple users to connect through
+a proxy, but we'll start with just one user at first. This project is 
experimental in the sense that we don't yet know how many resources it will 
take and whether the proxies will be reliable enough for clients to use.
+
+# Getting Started
+
+A good way to get started is to read the resources provided below and 
familiarize yourself with how Snowflake works. You can then:
+
+1. Take a look at the existing WebExtension proxy code, and
+2. Install the WebExtension to try it out for yourself: 
https://snowflake.torproject.org/
+
+Once you feel ready to get started on some tickets, you can search for 
webextension (proxy) based tickets on our bug tracking system by looking for 
the keyword 
["webextension"](https://trac.torproject.org/projects/tor/query?status=accepted=assigned=needs_information=needs_revision=new=reopened=~webextension=%5ECircumvention%2FSnowflake=type=id=summary=component=status=type=priority=milestone=priority)
 in the Snowflake component.
+
+# Resources
+
+We already have the proxy implemented as a WebExtension in javascript. You can 
take a look at that implementation for a more detailed idea of what exactly 
we're trying to do:
+
+- https://gitweb.torproject.org/pluggable-transports/snowflake.git/tree/proxy
+
+Some other links that will be useful are:
+
+- the technical writeup: https://keroserene.net/snowflake/technical/
+- deployment details and open tickets: 
https://trac.torproject.org/projects/tor/wiki/doc/Snowflake
+
+- [Snowflake](https://snowflake.torproject.org/)
+- Snowflake repo: 
https://gitweb.torproject.org/pluggable-transports/snowflake.git/
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/staging] Add some tips for students on how to contribute

[pili]

commit d8cc048fad46ea99e5753740d3a4dbabd763ce4c
Author: Pili Guerra 
Date:   Mon Mar 2 17:38:45 2020 +0100

Add some tips for students on how to contribute
---
 content/gsoc/cloudflare-captcha-monitoring/contents.lr | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr 
b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
index e6ba0d5..fab93fb 100644
--- a/content/gsoc/cloudflare-captcha-monitoring/contents.lr
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -35,7 +35,15 @@ One catch is that Cloudflare currently gives alt-svc headers 
in response to fetc
 
 Once we get the infrastructure set up, we would be smart to run a second one 
which is just wget or curl or lynx or something, i.e. which doesn't behave like 
Tor Browser, in order to be able to track the difference between how Cloudflare 
responds to Tor Browser vs other browsers.
 
-I imagine that Cloudflare should be internally tracking how they're handling 
Tor requests, but having a public tracker (a) gives the data to everybody, and 
(b) helps Cloudflare have a second opinion in case their internal data diverges 
from the public version.
+# Getting Started
+
+As this is a new project, in order to demonstrate your skills and familiarise 
yourself with this project you may want to:
+
+1. Set up the required infrastructure for this project e.g by setting up a 
very simple static webpage to be fronted by Cloudflare.
+2. Familiarise yourself and start experimenting with various web clients to 
fetch pages via Tor, bearing in mind you may need to adapt them to your needs 
if they are lacking the required functionality.
+3. Read the comments in ticket 
[#33010](https://trac.torproject.org/projects/tor/ticket/33010) for more ideas
+
+# Resources
 
 The Berkeley ICSI group did research that included this sort of check:
 ​https://www.freehaven.net/anonbib/#differential-ndss2016

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Add tor-keygen to the list of projects

[pili]

commit 1de7797dc617c4bfe6317d6b6de50938c5017511
Author: Pili Guerra 
Date:   Thu Feb 6 12:35:47 2020 +0100

Add tor-keygen to the list of projects
---
 content/gsoc/tor-keygen/contents.lr | 49 +
 1 file changed, 49 insertions(+)

diff --git a/content/gsoc/tor-keygen/contents.lr 
b/content/gsoc/tor-keygen/contents.lr
new file mode 100644
index 000..f32192f
--- /dev/null
+++ b/content/gsoc/tor-keygen/contents.lr
@@ -0,0 +1,49 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 12
+---
+languages:
+C
+Python
+Golang
+Rust
+---
+mentors:
+asn
+dgoulet
+---
+difficulty: medium/hard
+---
+title: tor-keygen
+---
+subtitle:
+
+The scope of this project is to write an application that generates 
cryptographic keys for Tor relays, dirauths and onion services.
+---
+body:
+
+# Problem
+
+
+# Proposal
+
+Prerequisites: Understanding of Tor protocol and tor codebase 
+
+# Resources
+
+- https://trac.torproject.org/projects/tor/ticket/18098
+- https://trac.torproject.org/projects/tor/ticket/14389
+- 
https://github.com/torproject/tor/blob/e34d963c4453ceac7ff378ce0044d10461980c8e/src/app/main/main.c#L1282
+- Original tor-keygen repo on github: https://github.com/haxxpop/torkeygen
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Update Tor Weather details

[pili]

commit fdf68d8adcc81d228e01d91218c7bc7d1b3c37bf
Author: Pili Guerra 
Date:   Mon Mar 2 17:17:02 2020 +0100

Update Tor Weather details
---
 content/gsoc/tor-weather/contents.lr | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/gsoc/tor-weather/contents.lr 
b/content/gsoc/tor-weather/contents.lr
index 3023237..cc6b997 100644
--- a/content/gsoc/tor-weather/contents.lr
+++ b/content/gsoc/tor-weather/contents.lr
@@ -39,8 +39,8 @@ If a relay disappears today, it is unlikely that anyone will 
notice or even send
 The entire Tor network would benefit from a "Tor Weather" service to notify 
relay and bridge operators when the state of their relays has changed. This has 
a number of benefits, including:
 
 - increasing the likelihood that relay operators notice problems and actually 
mitigate them.
-- showing relay operators that someone actually cares if their relays go down 
or become outdated or have another problems
-- giving relay operators information about best-practices, e.g not running 
outdated versions, fixing their DNs, etc...
+- showing relay operators that someone actually cares if their relays go down 
or become outdated or have other problems
+- giving relay operators information about best-practices, e.g not running 
outdated versions, fixing their DNS, etc...
 
 Right now, there is very little direct feedback given to relay operators. This 
can mean that operators become discouraged and stop running relays.
 
@@ -58,7 +58,7 @@ Once a basic email notification service is implemented, these 
are some ideas for
 - Email me when my relay runs an end-of-life version of tor
 - Email me when my relay runs an outdated tor version
 - Email me when my exit relay fails to resolve hostnames (DNS failure)
-- Email me when my relay looses the stable/guard/exit flag
+- Email me when my relay loses the stable/guard/exit flag
 - Email me when my MyFamily configuration is broken
 - Email me when you detect issues with my relay
 - Email me with suggestions for configuration improvements for my relay



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] tor-relay-ipv6: Update GSoC Info

[pili]

commit 92e837fc290a7da71b4de30a3f90f4f61e541409
Author: teor 
Date:   Wed Feb 5 22:35:00 2020 +1000

tor-relay-ipv6: Update GSoC Info
---
 content/gsoc/tor-relay-ipv6-support/contents.lr | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/gsoc/tor-relay-ipv6-support/contents.lr 
b/content/gsoc/tor-relay-ipv6-support/contents.lr
index 86518a2..fdc3f78 100644
--- a/content/gsoc/tor-relay-ipv6-support/contents.lr
+++ b/content/gsoc/tor-relay-ipv6-support/contents.lr
@@ -19,7 +19,8 @@ C
 ---
 mentors:
 teor
-ahf (to be confirmed)
+ahf
+nickm
 ---
 difficulty: Medium
 ---

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [dev/staging] Adding some placeholder content and structure

[pili]

commit af261523af7a550131487c0f1eb97d4ff9ac5442
Author: Pili Guerra 
Date:   Fri Feb 28 20:12:33 2020 +0100

Adding some placeholder content and structure
---
 content/anti-censorship/bridgedb/contents.lr   | 32 +++
 content/anti-censorship/contents.lr|  2 +-
 content/anti-censorship/gettor/contents.lr | 32 +++
 .../pluggable-transports/contents.lr   | 32 +++
 content/network/contents.lr|  4 +-
 content/network/tor/contents.lr| 32 +++
 models/idea.ini| 47 ++
 models/ideas.ini   | 33 +++
 models/project.ini | 43 
 models/projects.ini| 33 +++
 templates/gsoc.html|  2 +-
 templates/macros/ideas.html| 24 +++
 templates/macros/projects.html | 16 ++--
 templates/project-page.html|  0
 templates/team-page.html   | 29 +
 15 files changed, 346 insertions(+), 15 deletions(-)

diff --git a/content/anti-censorship/bridgedb/contents.lr 
b/content/anti-censorship/bridgedb/contents.lr
new file mode 100644
index 000..aa40f3b
--- /dev/null
+++ b/content/anti-censorship/bridgedb/contents.lr
@@ -0,0 +1,32 @@
+_model: project
+---
+_template: layout.html
+---
+html: project-page.html
+---
+maintained: True
+---
+section: anti-censorship
+---
+section_id: anti-censorship
+---
+color: primary
+---
+key: 1
+---
+languages:
+Python
+---
+maintainers:
+phw
+---
+title: BridgeDB
+---
+subtitle:
+ 
+BridgeDB is a collection of backend servers used to distribute Tor bridges.
+
+---
+body:
+
+longer text
\ No newline at end of file
diff --git a/content/anti-censorship/contents.lr 
b/content/anti-censorship/contents.lr
index c1259a3..5991e26 100644
--- a/content/anti-censorship/contents.lr
+++ b/content/anti-censorship/contents.lr
@@ -12,7 +12,7 @@ subtitle: The anti-censorship team is a group of Tor people 
who make Tor reachab
 ---
 key: 1
 ---
-html: training.html
+html: team-page.html
 ---
 body:
 
diff --git a/content/anti-censorship/gettor/contents.lr 
b/content/anti-censorship/gettor/contents.lr
new file mode 100644
index 000..0029e53
--- /dev/null
+++ b/content/anti-censorship/gettor/contents.lr
@@ -0,0 +1,32 @@
+_model: project
+---
+_template: layout.html
+---
+html: project-page.html
+---
+maintained: True
+---
+section: anti-censorship
+---
+section_id: anti-censorship
+---
+color: primary
+---
+key: 1
+---
+languages:
+Python
+---
+maintainers:
+hiro
+---
+title: GetTor
+---
+subtitle:
+ 
+GetTor is a program that presents alternative methods to download Tor Browser, 
especially when access to Tor Project's official website and mirrors is blocked.
+
+---
+body:
+
+longer text
\ No newline at end of file
diff --git a/content/anti-censorship/pluggable-transports/contents.lr 
b/content/anti-censorship/pluggable-transports/contents.lr
new file mode 100644
index 000..ea8c72d
--- /dev/null
+++ b/content/anti-censorship/pluggable-transports/contents.lr
@@ -0,0 +1,32 @@
+_model: project
+---
+_template: layout.html
+---
+html: project-page.html
+---
+maintained: True
+---
+section: anti-censorship
+---
+section_id: anti-censorship
+---
+color: primary
+---
+key: 1
+---
+languages:
+Go
+---
+maintainers:
+hiro
+---
+title: Pluggable Transports
+---
+subtitle:
+ 
+Pluggable Transports (PTs) were created to help uses who can't access the Tor 
network due to some type of censorship against Tor.
+
+---
+body:
+
+PTs can transform the Tor traffic flow between the client and the bridge. This 
way, censors who monitor traffic between the client and the bridge will see 
innocent-looking transformed traffic instead of the actual Tor traffic. 
External programs can talk to Tor clients and Tor bridges using the Pluggable 
Transport API, to make it easier to build interoperable programs.
\ No newline at end of file
diff --git a/content/network/contents.lr b/content/network/contents.lr
index 6eed72a..3a60b37 100644
--- a/content/network/contents.lr
+++ b/content/network/contents.lr
@@ -12,10 +12,12 @@ subtitle: The Network Team is a group of Tor people who are 
working on the Tor b
 ---
 key: 4
 ---
-html: training.html
+html: team-page.html
 ---
 body:
 
 Welcome to the Network Team page!
 
+## What we do
+
 The Network Team is a group of Tor people who are working on Tor back-end: the 
program called tor, the network simulators, the scripts that support directory 
authorities, onion services, etc. Basically, everything that sends and receives 
bytes from the network.
\ No newline at end of file
diff --git a/content/network/tor/contents.lr b/content/network/tor/contents.lr
new file mode 100644
index 000..b603a90
--- /dev/null
+++ b/content/network/tor

[tor-commits] [dev/staging] Initial content skeleton

[pili]

commit 59aa4ccf9e864605b8bd3a1a19eda72c81f3036e
Author: Pili Guerra 
Date:   Fri Feb 28 15:33:44 2020 +0100

Initial content skeleton
---
 content/anti-censorship/contents.lr | 21 
 content/applications/contents.lr| 21 
 content/metrics/contents.lr | 21 
 content/network-health/contents.lr  | 48 +
 content/network/contents.lr | 21 
 content/project-ideas/contents.lr   | 23 ++
 content/tor-ecosystem/contents.lr   | 17 +
 templates/gsoc.html | 24 +++
 templates/home.html | 26 
 templates/macros/projects.html  | 24 +++
 10 files changed, 241 insertions(+), 5 deletions(-)

diff --git a/content/anti-censorship/contents.lr 
b/content/anti-censorship/contents.lr
new file mode 100644
index 000..c1259a3
--- /dev/null
+++ b/content/anti-censorship/contents.lr
@@ -0,0 +1,21 @@
+section: anti-censorship
+---
+section_id: anti-censorship
+---
+color: primary
+---
+_template: layout.html
+---
+title: Anti-Censorship Team
+---
+subtitle: The anti-censorship team is a group of Tor people who make Tor 
reachable anywhere in the world.
+---
+key: 1
+---
+html: training.html
+---
+body:
+
+Welcome to the anti-censorship team page!
+
+The anti-censorship team is a group of Tor people who make Tor reachable 
anywhere in the world. We analyze censorship attempts and develop technology to 
work around these censorship attempts.
\ No newline at end of file
diff --git a/content/applications/contents.lr b/content/applications/contents.lr
new file mode 100644
index 000..8e44939
--- /dev/null
+++ b/content/applications/contents.lr
@@ -0,0 +1,21 @@
+section: applications
+---
+section_id: applications
+---
+color: primary
+---
+_template: layout.html
+---
+title: Applications Team
+---
+subtitle: The Applications Team is a group of Tor people who are working on 
different user facing products.
+---
+key: 2
+---
+html: training.html
+---
+body:
+
+Welcome to the Applications Team page.
+
+The Applications Team is a group of Tor people who are working on different 
user facing products: Tor Browser, Tor Messenger, Tor Mail, Orbot etc.
\ No newline at end of file
diff --git a/content/metrics/contents.lr b/content/metrics/contents.lr
new file mode 100644
index 000..e870b2c
--- /dev/null
+++ b/content/metrics/contents.lr
@@ -0,0 +1,21 @@
+section: metrics
+---
+section_id: metrics
+---
+color: primary
+---
+_template: layout.html
+---
+title: Metrics Team
+---
+subtitle: The Metrics Team is a group of Tor people who care about measuring 
and analyzing things in the public Tor network.
+---
+key: 3
+---
+html: training.html
+---
+body:
+
+Welcome to the Metrics Team page!
+
+The Metrics Team is a group of Tor people who care about measuring and 
analyzing things in the public Tor network. If you're interested in 
measurements and analyses, the Metrics Team is what you're looking for. Welcome!
\ No newline at end of file
diff --git a/content/network-health/contents.lr 
b/content/network-health/contents.lr
new file mode 100644
index 000..5bf3b54
--- /dev/null
+++ b/content/network-health/contents.lr
@@ -0,0 +1,48 @@
+section: network-health
+---
+section_id: network-health
+---
+color: primary
+---
+_template: layout.html
+---
+title: Network Health Team
+---
+subtitle: The Network Health Team coordinates network performance and 
scalability work as well as other network health related tasks. 
+---
+key: 5
+---
+html: training.html
+---
+body:
+
+Welcome to the Network Health Team page!
+
+The team was created on January 2020 and it works on these five areas:
+
+1. track community standards about what makes a good relay
+  - publish up-to-date expectations for relay operators
+  - set best practices for how to set relay families
+  - detect and resolve bad relays
+  - exitmap, sybil detection, hsdir traps
+2. anomaly analysis / network health engineer [with network team]
+  - establish baselines of expected network behavior
+  - look for and resolve denial of service issues
+  - track connectivity issues between relays
+  - look for relays hitting resource limits
+3. make sure usage/growth stats are collected and accurate
+  - track network performance, relay diversity by various metrics
+  - count users [with network team and metrics team]
+  - monitor bridge growth and usage [with censorship team]
+4. relay advocacy [with community team]
+  - maintain docs for setting up and running relays and bridges
+  - grow a cohesive community of relay operators so they have peers
+  - keep relays on the right tor versions
+  - relaunch a gamification / badge system for lauding good relay progress
+  - strengthen relationships with non-profit orgs that run relays
+  - help companies that want to offset their tor network load
+5. maintain the components of the network
+  - maintain directory authority

[tor-commits] [community/master] tor-relay-ipv6: Update GSoC Info

[pili]

commit 6f92cbe54f495cb9f1d4c4edac27924d93c11948
Author: teor 
Date:   Wed Feb 5 22:35:00 2020 +1000

tor-relay-ipv6: Update GSoC Info
---
 content/gsoc/tor-relay-ipv6-support/contents.lr | 40 ++---
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/content/gsoc/tor-relay-ipv6-support/contents.lr 
b/content/gsoc/tor-relay-ipv6-support/contents.lr
index ea4a9df..86518a2 100644
--- a/content/gsoc/tor-relay-ipv6-support/contents.lr
+++ b/content/gsoc/tor-relay-ipv6-support/contents.lr
@@ -19,7 +19,7 @@ C
 ---
 mentors:
 teor
-ahf
+ahf (to be confirmed)
 ---
 difficulty: Medium
 ---
@@ -32,30 +32,50 @@ Tor helps people stay safe on the internet, by keeping 
their internet use secure
 ---
 body:
 
-Students may choose to focus on designing and implementing core features, tor 
relay testing, reporting statistics, or diagnosing and fixing bugs.
+The Tor Project will be improving tor relay IPv6 support in 2020.
 
+Students may choose to focus on:
+ * designing and implementing tor relay IPv6 features,
+ * tor relay IPv6 testing, or
+ * diagnosing and fixing bugs in tor's IPv6 code.
 
 ## Prerequisites
 
 * Network configuration skills
-* Basic understanding of Internet Protocol (IP) versions
+* Basic understanding of IPv4 and IPv6
 
 Recommended:
 
 * Experience testing network software
 * Experience running Internet-connected servers
 
+## Programming skills needed:
+
+* C coding
+* Building Unix-based (Linux, *BSD, macOS) software
+
+Recommended:
+
+* Experience with Unix network programming
+* Python coding (for testing)
+* Access to a server with public IPv4 and IPv6 addresses (to run a test relay)
+
 ## Links/Resources
 
-https://trac.torproject.org/projects/tor/wiki/TorRelayGuide#IPv6
+### Technical Proposals
 
-https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Tor/IPv6Features#ReachabilityChecks
+Tor Relay IPv6 Reachability
+https://gitweb.torproject.org/torspec.git/tree/proposals/311-relay-ipv6-reachability.txt
 
-## Programming skills needed:
+Tor Relay Automatic IPv6 Address Discovery
+https://gitweb.torproject.org/torspec.git/tree/proposals/312-relay-auto-ipv6-addr.txt
 
-* C coding
-* Building Unix-based software
+### Relay Operator Guides
 
-Recommended:
+Tor Relay Guide: IPv6
+https://trac.torproject.org/projects/tor/wiki/TorRelayGuide#IPv6
+
+### Roadmaps
 
-* Experience with network programming
+Tor IPv6 Roadmap
+https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Tor/IPv6Features



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Update GSoC project descriptions

[pili]

commit 7555fb6d626f6b4317ffd0cf8861fd9c23f14175
Author: Pili Guerra 
Date:   Wed Feb 5 14:50:36 2020 +0100

Update GSoC project descriptions
---
 content/gsoc/privacy-friendly-web/contents.lr   | 15 ---
 content/gsoc/salmon-bridge-distribution/contents.lr | 13 +++--
 content/gsoc/snowflake-android-proxy/contents.lr| 11 +--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/content/gsoc/privacy-friendly-web/contents.lr 
b/content/gsoc/privacy-friendly-web/contents.lr
index 2878195..7ab642b 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -33,18 +33,27 @@ The scope of this project is creating a open-source 
community-driven browsable l
 ---
 body:
 
+# Problem
+
 Security concerned web users take conscious steps to limit the amount of data 
they share with the websites visited and third party services.
 
 There are a number of security enhancing tools available. Some come in the 
form of browser extensions and javascript blockers, others are full fledged web 
browsers designed with providing extra security to their users.
 
-One of this is the Tor Browser. The Tor Browser was designed to provide 
privacy while surfing the web and defend users against both network and local 
forensic adversaries. There are two main categories of requirements that have 
been considered: Security Requirements, and Privacy Requirements.
+One of these is the Tor Browser. The Tor Browser was designed to provide 
privacy while surfing the web and defend users against both network and local 
forensic adversaries. There are two main categories of requirements that have 
been considered: Security Requirements, and Privacy Requirements.
 
 Security Requirements are the minimum properties in order for a browser to be 
able to support Tor and similar privacy proxies safely. Privacy requirements 
are primarily concerned with reducing linkability: the ability for a user's 
activity on one site to be linked with their activity on another site without 
their knowledge or explicit consent.
 
-Websites can work seamsly with the Tor Browser and other privacy enhancing 
browsers and tools if they adopt a series of respectful and ethical patterns.
+# Proposal
+
+Websites can work seamlessly with the Tor Browser and other privacy enhancing 
browsers and tools if they adopt a series of respectful and ethical patterns.
 
 The Tor Browser is in fact, based on Mozilla's Extended Support Release (ESR) 
Firefox branch. We have a series of patches against this browser to enhance 
privacy and security. Browser behavior is additionally augmented through the 
Torbutton extension, and we also change a number of Firefox preferences from 
their defaults.
 
 The Tor Project has developed over the years a set of web development 
guidelines that allow websites to work with security enhanced browsers without 
causing any or minimal functionality destruption to their users. These 
guidelines have been shaped in an internal styleguide that has been adopted 
across all torproject.org websites.
 
-We are now formalizing these web development patterns and some security 
concerns that need to be considered when developing websites for users surfing 
the web with security enhanced browsers and tools.
+We are now formalizing these web development patterns and some security 
concerns that need to be considered when developing websites for users surfing 
the web with security enhanced browsers and tools. The scope of this project is 
creating a open-source community-driven browsable list of patterns and release 
a css/js framework that web developers can extend and use in their work.
+
+# Resources
+
+- Tor Project [styleguide](https://styleguide.torproject.org/)
+- Styleguide repo on github: https://github.com/torproject/styleguide
diff --git a/content/gsoc/salmon-bridge-distribution/contents.lr 
b/content/gsoc/salmon-bridge-distribution/contents.lr
index 85a5598..8ec5614 100644
--- a/content/gsoc/salmon-bridge-distribution/contents.lr
+++ b/content/gsoc/salmon-bridge-distribution/contents.lr
@@ -33,7 +33,16 @@ This project entails implementing Salmon, a bridge 
distribution mechanism that p
 ---
 body:
 
-Short description: Many users rely on bridges, or anti-censorship proxies, to 
connect to the Tor network. We need a way of distributing bridge information to 
users so that they are able to connect. However, when censors learn this 
information the bridges quickly become blocked and can no longer be used. Our 
goal is to distribute bridges to users in censored regions when they need them, 
while also limiting the amount of bridge information that is leaked to censors.
+# Problem
 
-For more information on Salmon, see the related paper and source code.
+Bridges are Tor relays that are not publicly listed and therefore allow access 
to the Tor network in places where access to the public Tor relays, and 
therefore access to the Tor network, is blocked

[tor-commits] [community/master] Update GSoC Project descriptions

[pili]

commit 5e7203d4925992265aeb1b876c5df629b299e87f
Author: Pili Guerra 
Date:   Wed Feb 5 12:36:31 2020 +0100

Update GSoC Project descriptions
---
 content/gsoc/onion-toolbox/contents.lr | 34 --
 .../gsoc/ooni-explorer-advanced-search/contents.lr | 18 
 content/gsoc/ooni-probe-experiments/contents.lr| 16 ++
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/content/gsoc/onion-toolbox/contents.lr 
b/content/gsoc/onion-toolbox/contents.lr
index bae15c0..1d52e87 100644
--- a/content/gsoc/onion-toolbox/contents.lr
+++ b/content/gsoc/onion-toolbox/contents.lr
@@ -29,24 +29,31 @@ title: Onion Tool Box
 ---
 subtitle:
 
-Myonion is a developer tool box, providing a command line interface and a GUI 
to configure and deploy existing services via .onion. A minimal prototype for 
myonion already [exists](https://github.com/hiromipaw/myonion).
-
-Someone that may want to run an onion service can use the myonion wrapper app 
to start a .onion from their computer and sharea static website or a web 
application.
-
-Myonion can also be used to deploy the resulting configured app to a defined 
set of cloud providers.
-
+Myonion is a developer tool box, providing a command line interface and a GUI 
to configure and deploy existing services via .onion. The idea behind myonion 
is to make onion services accessible to developers that might be interested to 
innovate in the privacy space, building applications that are designed for 
privacy and security.
 ---
 body:
 
-## Problem definition
+# Problem
 
 It is not necessarily difficult to use onion services, but it might be tricky 
to configure a web service to be offered via .onion so that it doesn’t leak 
sensitive information.
 
 There are detailed 
[guides](https://riseup.net/en/security/network-security/tor/onionservices-best-practices)
 available for users that would like to offer a web application via .onion and 
some tools have been developed to help service operators: discover known 
misconfiguration or [vulnerabilities](https://onionscan.org/) or deploy an 
[onion site](https://github.com/alecmuffett/eotk).
 
-## Scope
+Involving a wider developer community can help creating a better image of Tor 
and onion services, replacing the “dark net” narrative with the secure and 
private web one.
+
+Onion services can also be relevant to all those people interested in the 
“zero-trust” strategy. The concept behind zero-trust is to adopt strategies 
and tools to help prevent data breaches by eliminating the concept of trust 
from an organization’s network architecture, with the principle of never 
trust, always verify.
 
-Myonion provides a way to build and deploy onion ready applications, allowing 
developers to build and test web applications and easily share them with 
others, bundling the code and configuration in a lightweight, portable Docker 
container application that runs thesame everywhere.
+Ultimately myonion is about creating a better experience for onion services 
developers and operators and therefore fostering a more legitimate onion 
service ecosystem.
+
+# Proposal
+
+Myonion is a developer tool box, providing a command line interface and a GUI 
to configure and deploy existing services via .onion. A minimal prototype for 
myonion already [exists](https://github.com/hiromipaw/myonion).
+
+Someone that may want to run an onion service can use the myonion wrapper app 
to start a .onion from their computer and sharea static website or a web 
application.
+
+Myonion can also be used to deploy the resulting configured app to a defined 
set of cloud providers.
+
+Myonion provides a way to build and deploy onion ready applications, allowing 
developers to build and test web applications and easily share them with 
others, bundling the code and configuration in a lightweight, portable Docker 
container application that runs the same everywhere.
 
 The experience for developers will be similar to using other industry 
solutions, like the [Docker desktop 
app](https://www.docker.com/products/docker-desktop).
 
@@ -54,12 +61,7 @@ Developers using myonion are provided with pre-defined and 
customizable applicat
 
 The resulting application is therefore deployable via a set of endpoint 
management tools to known providers. Providing a way to deploy onion services 
at scale.
 
-## Impact
+# Resources
 
-The idea behind myonion is to make onion services accessible to developers 
that might be interested to innovate in the privacy space, building 
applications that are designed for privacy and security.
+- Myonion repo on github: https://github.com/hiromipaw/myonion
 
-Involving a wider developer community can help creating a better image of Tor 
and onion services, replacing the “dark net” narrative with the secure and 
private web one.
-
-Onion services can also be relevant to all those people interested in the 
“zero-trust” strategy. The concept behind zero-trust is to adopt

[tor-commits] [community/master] Update content for OONI GSoC projects

[pili]

commit 3d86d5893b03a05ca8957ec2264d9b195c15fb35
Author: Pili Guerra 
Date:   Wed Feb 5 13:05:30 2020 +0100

Update content for OONI GSoC projects
---
 content/gsoc/ooni-explorer-advanced-search/contents.lr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/gsoc/ooni-explorer-advanced-search/contents.lr 
b/content/gsoc/ooni-explorer-advanced-search/contents.lr
index cd3f5d6..be381fd 100644
--- a/content/gsoc/ooni-explorer-advanced-search/contents.lr
+++ b/content/gsoc/ooni-explorer-advanced-search/contents.lr
@@ -32,9 +32,9 @@ OONI Explorer is an open data resource on internet censorship 
around the world.
 ---
 body:
 
-# Problem
-
+# Background
 
+OONI Explorer is an open data resource on internet censorship around the 
world. This project is about enriching the OONI Explorer search functionality 
with the ability to visualize an analysis of metadata pertaining to filtered 
measurements.
 
 # Proposal
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Update content for OONI GSoC projects

[pili]

commit 36511588e98db38b9bdc0030e4ea9b4ed5358fdc
Author: Pili Guerra 
Date:   Wed Feb 5 13:04:39 2020 +0100

Update content for OONI GSoC projects
---
 content/gsoc/ooni-probe-experiments/contents.lr   | 14 +-
 content/gsoc/privacy-aware-geo-lookup/contents.lr | 17 +
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/content/gsoc/ooni-probe-experiments/contents.lr 
b/content/gsoc/ooni-probe-experiments/contents.lr
index 4d5d2f7..1eb568e 100644
--- a/content/gsoc/ooni-probe-experiments/contents.lr
+++ b/content/gsoc/ooni-probe-experiments/contents.lr
@@ -33,7 +33,19 @@ OONI Probe is a free software project that aims to uncover 
internet censorship a
 ---
 body:
 
-# Problem
+# Background
+
+The Open Observatory of Network Interference (OONI) is a free software project 
which aims to empower decentralized efforts in increasing transparency of 
internet censorship around the world.
+
+We develop free and open source software, called OONI Probe, that users can 
run to measure:
+
+- Blocking of websites;
+- Blocking of instant messaging apps (WhatsApp, Facebook Messenger and 
Telegram);
+- Blocking of censorship circumvention tools (such as Tor);
+- Presence of systems (middleboxes) in your network that might be responsible 
for censorship and/or surveillance;
+- Speed and performance of your network.
+
+By running OONI Probe, users can collect data that can potentially serve as 
evidence of internet censorship since it shows how, when, where, and by whom it 
is implemented.
 
 # Proposal
 
diff --git a/content/gsoc/privacy-aware-geo-lookup/contents.lr 
b/content/gsoc/privacy-aware-geo-lookup/contents.lr
index 1a58eb2..e170747 100644
--- a/content/gsoc/privacy-aware-geo-lookup/contents.lr
+++ b/content/gsoc/privacy-aware-geo-lookup/contents.lr
@@ -17,6 +17,7 @@ key: 6
 languages: 
 Golang
 Java
+Android
 ---
 org: OONI
 ---
@@ -26,7 +27,7 @@ Arturo Filastò
 ---
 difficulty: Medium
 ---
-title: OONI Probe network experiments
+title: Privacy aware geo lookup
 ---
 subtitle:
 
@@ -35,13 +36,21 @@ The idea for this project is to research a way to do a GPS 
based location lookup
 ---
 body:
 
+# Problem
+
 When looking at OONI Probe measurements we often face a challenge in properly 
understanding what country (or more granular location) they are telling us 
things about.
 
 Often times the location information (since it's based on geoip) is 
inaccurate, because the underlying GeoIP database we used was old.
 
 On the other hand we also have a responsibility to protect user privacy to the 
extent that it's possible and therefore we don't collect IPs or store location 
information that is more granular than country level.
 
-See: https://github.com/ooni/probe-engine/issues/249
+# Proposal
+*Prerequisites:* familiarity with Android development and aptitude for research
+
+The idea for this project is to research a way to do a GPS based location 
lookup which resolves the location of the user to a granularity which is useful 
for qualifying measurements, but that doesn’t compromise users safety and 
privacy.
+
+# Resources
+
+- OONI Probe engine repo on github: https://github.com/ooni/probe-engine
 
-Prerequisites: familiarity with Android development and aptitude for research
-Links/Resource: https://github.com/ooni/probe-engine/issues/249
\ No newline at end of file
+For the original ticket and discussion, please see ticket 
[249](https://github.com/ooni/probe-engine/issues/249)
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] GSoC mentors should be a list of strings

[pili]

commit bf9327689fe06bd9554c13da645d0aa70203cac3
Author: Pili Guerra 
Date:   Wed Feb 5 10:48:10 2020 +0100

GSoC mentors should be a list of strings
---
 models/project.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/project.ini b/models/project.ini
index 17c3260..09ba867 100644
--- a/models/project.ini
+++ b/models/project.ini
@@ -28,7 +28,7 @@ type = markdown
 
 [fields.mentors]
 label = Mentors
-type = string
+type = strings
 
 [fields.languages]
 label = Languages



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Fix Mentor display

[pili]

commit 5eae339ed7a32f881f1ee23f0185ec5572d05655
Author: Pili Guerra 
Date:   Wed Feb 5 11:59:58 2020 +0100

Fix Mentor display
---
 content/gsoc/cloudflare-captcha-monitoring/contents.lr | 4 +++-
 content/gsoc/gettor-distribution/contents.lr   | 2 +-
 content/gsoc/onion-toolbox/contents.lr | 4 +++-
 content/gsoc/ooni-explorer-advanced-search/contents.lr | 4 +++-
 content/gsoc/ooni-probe-experiments/contents.lr| 4 +++-
 content/gsoc/privacy-aware-geo-lookup/contents.lr  | 4 +++-
 content/gsoc/privacy-friendly-web/contents.lr  | 3 ++-
 content/gsoc/salmon-bridge-distribution/contents.lr| 4 +++-
 content/gsoc/snowflake-android-proxy/contents.lr   | 3 ++-
 content/gsoc/tor-relay-ipv6-support/contents.lr| 4 +++-
 models/project.ini | 4 
 templates/macros/projects.html | 6 ++
 12 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr 
b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
index dbdc7e4..c311934 100644
--- a/content/gsoc/cloudflare-captcha-monitoring/contents.lr
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -18,7 +18,9 @@ languages:
 python
 javascript
 ---
-mentors: GeKo, arma
+mentors:
+GeKo
+arma
 ---
 difficulty: medium
 ---
diff --git a/content/gsoc/gettor-distribution/contents.lr 
b/content/gsoc/gettor-distribution/contents.lr
index b39c92e..797a2ff 100644
--- a/content/gsoc/gettor-distribution/contents.lr
+++ b/content/gsoc/gettor-distribution/contents.lr
@@ -20,7 +20,7 @@ ansible
 ---
 org: Tor
 ---
-mentors: 
+mentors:
 cohosh
 hiro
 ---
diff --git a/content/gsoc/onion-toolbox/contents.lr 
b/content/gsoc/onion-toolbox/contents.lr
index ed8b5e4..bae15c0 100644
--- a/content/gsoc/onion-toolbox/contents.lr
+++ b/content/gsoc/onion-toolbox/contents.lr
@@ -19,7 +19,9 @@ Python
 Docker
 PythonQt5
 ---
-mentors: hiro, asn
+mentors:
+hiro
+asn
 ---
 difficulty: medium
 ---
diff --git a/content/gsoc/ooni-explorer-advanced-search/contents.lr 
b/content/gsoc/ooni-explorer-advanced-search/contents.lr
index 99b9484..b4d883c 100644
--- a/content/gsoc/ooni-explorer-advanced-search/contents.lr
+++ b/content/gsoc/ooni-explorer-advanced-search/contents.lr
@@ -18,7 +18,9 @@ languages: React
 ---
 org: OONI
 ---
-mentors: Federico Ceratto, Arturo Filastò
+mentors:
+Federico Ceratto
+Arturo Filastò
 ---
 difficulty: Medium
 ---
diff --git a/content/gsoc/ooni-probe-experiments/contents.lr 
b/content/gsoc/ooni-probe-experiments/contents.lr
index 8f18dcc..c6426ef 100644
--- a/content/gsoc/ooni-probe-experiments/contents.lr
+++ b/content/gsoc/ooni-probe-experiments/contents.lr
@@ -18,7 +18,9 @@ languages: Golang
 ---
 org: OONI
 ---
-mentors: Simone Basso, Arturo Filastò
+mentors:
+Simone Basso
+Arturo Filastò
 ---
 difficulty: low-high
 ---
diff --git a/content/gsoc/privacy-aware-geo-lookup/contents.lr 
b/content/gsoc/privacy-aware-geo-lookup/contents.lr
index d0ba616..1a58eb2 100644
--- a/content/gsoc/privacy-aware-geo-lookup/contents.lr
+++ b/content/gsoc/privacy-aware-geo-lookup/contents.lr
@@ -20,7 +20,9 @@ Java
 ---
 org: OONI
 ---
-mentors: Simone Basso, Arturo Filastò
+mentors:
+Simone Basso
+Arturo Filastò
 ---
 difficulty: Medium
 ---
diff --git a/content/gsoc/privacy-friendly-web/contents.lr 
b/content/gsoc/privacy-friendly-web/contents.lr
index c56e209..2878195 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -20,7 +20,8 @@ CSS
 HTML
 Python
 ---
-mentors: hiro
+mentors:
+hiro
 ---
 difficulty: medium
 ---
diff --git a/content/gsoc/salmon-bridge-distribution/contents.lr 
b/content/gsoc/salmon-bridge-distribution/contents.lr
index 11855dc..85a5598 100644
--- a/content/gsoc/salmon-bridge-distribution/contents.lr
+++ b/content/gsoc/salmon-bridge-distribution/contents.lr
@@ -18,7 +18,9 @@ languages:
 ---
 org: Tor
 ---
-mentors: 
+mentors:
+cohosh
+ahf
 ---
 difficulty: 
 ---
diff --git a/content/gsoc/snowflake-android-proxy/contents.lr 
b/content/gsoc/snowflake-android-proxy/contents.lr
index 96f802b..1e2dbf9 100644
--- a/content/gsoc/snowflake-android-proxy/contents.lr
+++ b/content/gsoc/snowflake-android-proxy/contents.lr
@@ -19,7 +19,8 @@ Android
 ---
 org: Tor
 ---
-mentors: cohosh
+mentors:
+cohosh
 ---
 difficulty: 
 ---
diff --git a/content/gsoc/tor-relay-ipv6-support/contents.lr 
b/content/gsoc/tor-relay-ipv6-support/contents.lr
index 4aff974..ea4a9df 100644
--- a/content/gsoc/tor-relay-ipv6-support/contents.lr
+++ b/content/gsoc/tor-relay-ipv6-support/contents.lr
@@ -17,7 +17,9 @@ key: 10
 languages:
 C
 ---
-mentors: teor, ahf, dgoulet, catalyst
+mentors:
+teor
+ahf
 ---
 difficulty: Medium
 ---
diff --git a/models/project.ini b/models/project.ini
index 09ba867..6d5f780 100644
--- a/models/project.ini
+++ b/models/project.ini
@@ -34,10 +34,6 @@ type = strings
 label = Languages
 type = strings
 
-[fields.mentors

[tor-commits] [community/master] Add email address for discussing new GSoC projects

[pili]

commit 58249a90844f59ce85e50595d883d0a6193ff91c
Author: Pili Guerra 
Date:   Wed Feb 5 10:46:05 2020 +0100

Add email address for discussing new GSoC projects
---
 content/gsoc/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/gsoc/contents.lr b/content/gsoc/contents.lr
index a74dc57..e56ab2b 100644
--- a/content/gsoc/contents.lr
+++ b/content/gsoc/contents.lr
@@ -20,4 +20,4 @@ title: Project Ideas
 ---
 body:
 
-You may find some of these projects to be good ideas for Google Summer of 
Code. We have labelled each idea with which of our core developers would be 
good mentors. If one or more of these ideas looks promising to you, please 
contact us to discuss your plans rather than sending blind applications.
+You may find some of these projects to be good ideas for Google Summer of 
Code. We have labelled each idea with which of our core developers would be 
good mentors. If one or more of these ideas looks promising to you, please 
[contact us](mailto:gs...@torproject.org) to discuss your plans rather than 
sending blind applications.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Rewrote and reviewed Gettor distribution methods GSoC project

[pili]

commit fdd0886a289e357d010cedb8d050564d66fafccf
Author: Pili Guerra 
Date:   Tue Feb 4 12:05:52 2020 +0100

Rewrote and reviewed Gettor distribution methods GSoC project
---
 content/gsoc/gettor-distribution/contents.lr | 25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/content/gsoc/gettor-distribution/contents.lr 
b/content/gsoc/gettor-distribution/contents.lr
index 19213f2..b39c92e 100644
--- a/content/gsoc/gettor-distribution/contents.lr
+++ b/content/gsoc/gettor-distribution/contents.lr
@@ -14,22 +14,37 @@ color: primary
 ---
 key: 2
 ---
-languages: python
+languages:
+python
+ansible
 ---
 org: Tor
 ---
-mentors: cohos, hiro
+mentors: 
+cohosh
+hiro
 ---
 difficulty: 
 ---
-title: Implement a new distribution methods for GetTor
+title: Implement new distribution methods for GetTor
 ---
 subtitle:
 
-This project would implement a feature to distribute Tor Browser downloads 
through Telegram or Facebook messenger.
+This project should implement a feature to distribute Tor Browser downloads 
through Telegram or Facebook messenger.
 
 ---
 body:
 
+# Problem
 
-Tor Browser ships with a few different anti-censorship tools to allow people 
free and open access to Internet content. However, some places censor Tor 
Browser downloads, making it difficult for users to install it in the first 
place. GetTor is a system for distributing Tor Browser using alternative 
methods such as email or Twitter to send users authenticated links to Tor 
Browser binaries. We are looking to expand the ways in which GetTor distributes 
these binaries. This project would implement a feature to distribute Tor 
Browser downloads through Telegram or Facebook messenger.
\ No newline at end of file
+Tor Browser ships with a few different anti-censorship tools to allow people 
free and open access to Internet content. However, some places censor Tor 
Browser downloads, making it difficult for users to install it in the first 
place.
+
+# Proposal
+
+[GetTor](https://gettor.torproject.org/) is a system for distributing Tor 
Browser using alternative methods such as email or Twitter to send users 
authenticated links to Tor Browser binaries.
+
+We are looking to expand the ways in which GetTor distributes Tor Browser 
binaries to make it easier for people to download and install Tor Browser. This 
project would consist in implementing a feature in GetTor to distribute Tor 
Browser downloads through Telegram and/or Facebook messenger.
+
+# Resources
+
+- GetTor repo on github: https://github.com/torproject/gettor
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Update GSoC CF project details

[pili]

commit ae31484c9b429b1f8b06c1869a6417a99b67f596
Author: Pili Guerra 
Date:   Tue Feb 4 12:02:58 2020 +0100

Update GSoC CF project details
---
 .../gsoc/cloudflare-captcha-monitoring/contents.lr| 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr 
b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
index 332ca2a..dbdc7e4 100644
--- a/content/gsoc/cloudflare-captcha-monitoring/contents.lr
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -15,46 +15,47 @@ color: primary
 key: 1
 ---
 languages:
+python
 javascript
 ---
 mentors: GeKo, arma
 ---
 difficulty: medium
 ---
-title: Cloudflare Captcha Monitoring
+title: Cloudflare CAPTCHA Monitoring
 ---
 subtitle:
 
-This project should implement a mechanism to track the rate that Cloudflare 
fronted webpages return captchas to Tor users over time.
+This project should implement a mechanism to track the rate that Cloudflare 
fronted webpages return CAPTCHAs to Tor users over time.
 
 ---
 body:
 
 # Problem
 
-A large number of Tor users report getting hit by infinite captcha loops when 
visiting webpages fronted by Cloudflare. This makes them feel punished for 
using Tor to protect their privacy and prevents them from legitimately 
accessing websites.
+A large number of Tor users report getting hit by infinite CAPTCHA loops when 
visiting webpages fronted by Cloudflare. This makes them feel punished for 
using Tor to protect their privacy and prevents them from legitimately 
accessing websites.
 
 # Proposal
 
-For this project we would like to track in practice how often Cloudflare 
fronted webpages return captchas to Tor clients.
+For this project we would like to track in practice how often Cloudflare 
fronted webpages return CAPTCHAs to Tor clients.
 
 Our proposed approach consists of:
 
 1. Setting up a very simple static webpage to be fronted by Cloudflare
-2. Write an application which  small client to periodically fetch this static 
webpage via Tor and record how often a captcha is returned
-3. Record and graph captcha vs real page rates
+2. Write a web client to periodically fetch this static webpage via Tor and 
record how often a CAPTCHA is returned
+3. Record and graph CAPTCHA vs real page rates
 4. Using the pre-existing architecture, run a second client that does not 
fetch this webpage via Tor. This will allow us to contrast and compare how 
Cloudflare responds to Tor Browser vs other browsers.
 5. Track and publish these details publicly
 
 There are two interesting metrics to track over time: 
 
-- the fraction of exit relays that are getting hit with captchas, and
-- the chance that a Tor client, choosing an exit relay in the normal weighted 
faction, will get hit by a captcha.
+- the fraction of exit relays that are getting hit with CAPTCHAs, and
+- the chance that a Tor client, choosing an exit relay in the normal weighted 
faction, will get hit by a CAPTCHA.
 
 Then there are other interesting patterns to look for:
 
 - Are certain IP addresses punished consistently and others never punished?
-- Is whether you get a captcha much more probabilistic and transient?
+- Is whether you get a CAPTCHA much more probabilistic and transient?
 - Does that pattern change over time?
 
 # Resources



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Update Tor Weather description

[pili]

commit ecc8c373f8b995afba19dec227545f81f59df876
Author: Pili Guerra 
Date:   Tue Feb 4 12:56:17 2020 +0100

Update Tor Weather description
---
 content/gsoc/tor-weather/contents.lr | 86 +++-
 1 file changed, 36 insertions(+), 50 deletions(-)

diff --git a/content/gsoc/tor-weather/contents.lr 
b/content/gsoc/tor-weather/contents.lr
index 01bb416..3023237 100644
--- a/content/gsoc/tor-weather/contents.lr
+++ b/content/gsoc/tor-weather/contents.lr
@@ -15,9 +15,12 @@ color: primary
 key: 11
 ---
 languages:
-TBD
+python
+java
 ---
-mentors: karsten
+mentors:
+GeKo
+karsten
 ---
 difficulty: medium
 ---
@@ -25,67 +28,50 @@ title: Tor Weather
 ---
 subtitle:
 
-Tor Weather is the most efficient way to achieve and maintain a healthy Tor 
network on the long run.
-
+This project would implement a notification system for relay operators to 
alert them when the state of their relay has changed. This is the most 
efficient way to achieve and maintain a healthy Tor network on the long run.
 ---
 body:
 
-Tor Weather was [discontinued on 
2016-04-04](https://lists.torproject.org/pipermail/tor-relays/2016-April/009009.html),
 however "Tor Weather is still a good idea, it just needs somebody to implement 
it."
-
-How Tor Weather looked like:
-​https://web.archive.org/web/20141004055709/https://weather.torproject.org/subscribe/
-
-## Motivation
-
-If a relay disappears today, it is unlikely that anyone will notice or even 
send an email to the operator unless it is a big one.
-
-Relay operators and the entire tor network would benefit from a Tor Weather 
service because it notifies relay operators when the state of their relays 
changed (and more). This will increase the likelihood that relay operators 
notice problems and actually mitigate the problem otherwise there is no "user 
feedback" since tor can cope with disappearing relays quite well.
-
-It also:
-- shows the relay operator that someone actually cares if their relays go down 
or become outdated or have another problem
-- gives the operator relay best-practices information.
+# Problem
 
-## Expected Effects
+If a relay disappears today, it is unlikely that anyone will notice or even 
send an email to the operator.
 
-If enough operators subscribe to such a service:
-- relays might become more long lived / the churn rate might decrease
-- the fraction of relays running outdated tor versions might decrease
-- the fraction of exits with broken DNS might decrease
+The entire Tor network would benefit from a "Tor Weather" service to notify 
relay and bridge operators when the state of their relays has changed. This has 
a number of benefits, including:
 
-It also has the benefit of being able to contact relay operators:
-- completely automatically
-- even if they choose to not set a public ContactInfo string in their torrc 
files.
+- increasing the likelihood that relay operators notice problems and actually 
mitigate them.
+- showing relay operators that someone actually cares if their relays go down 
or become outdated or have another problems
+- giving relay operators information about best-practices, e.g not running 
outdated versions, fixing their DNs, etc...
 
-## Ideas for Notification Types
+Right now, there is very little direct feedback given to relay operators. This 
can mean that operators become discouraged and stop running relays.
 
-_(sorted by importance)_
+# Proposal
 
-Support subscribing via single relay FP or MyFamily groups (should not need 
any subscription change if a relay gets added to the family).
+This project would involve the implementation of an email notification service 
that relay operators can subscribe to and choose which notifications they want 
to receive about their relay.
 
-- [ ] Email me when my node is down
-_How long before we send a notification?_
-- [ ] email me when my relay is affected by a security vulnerability
-- [ ] email me when my relay runs an end-of-life version of tor
-- [ ] email me when my relay runs an outdated tor version (note: this should 
depend on the related onionoo bugs to avoid emailing alpha relay people)
-- [ ] email me when my exit relay fails to resolve hostnames (DNS failure)
-- [ ] email me when my relay looses the [ ] stable, [ ] guard, [ ] exit flag
-- [ ] email me when my MyFamily configuration is broken (meaning: non-mutual 
config detected or relay with same contactInfo but no MyFamily)
-- [ ] email me when you detect issues with my relay
-- [ ] email me with suggestions for configuration improvements for my relay 
(only once per improvement)
-- [ ] email me when my relay is on the top [ ] 20 [ ] 50 [ ] 100 relays list
-- [ ] email me with monthly/quarterly status information that includes 
information like what my position in the overall relay list is (sorted by CW), 
how much traffic my relay did during the last month and what fraction of the 
months time your relay was included in consensus as running (this 

[tor-commits] [community/master] Fix style and order issues

[pili]

commit 0e0fbe73f9045e1eb862258a72ab27f1811d17b6
Author: Pili Guerra 
Date:   Tue Feb 4 11:01:01 2020 +0100

Fix style and order issues
---
 content/gsoc/cloudflare-captcha-monitoring/contents.lr | 2 +-
 content/gsoc/gettor-distribution/contents.lr   | 2 +-
 content/gsoc/onion-toolbox/contents.lr | 2 +-
 content/gsoc/ooni-explorer-advanced-search/contents.lr | 2 +-
 content/gsoc/ooni-probe-experiments/contents.lr| 2 +-
 content/gsoc/privacy-aware-geo-lookup/contents.lr  | 6 --
 content/gsoc/privacy-friendly-web/contents.lr  | 2 +-
 content/gsoc/salmon-bridge-distribution/contents.lr| 4 ++--
 content/gsoc/snowflake-android-proxy/contents.lr   | 3 ++-
 content/gsoc/tor-relay-ipv6-support/contents.lr| 2 +-
 content/gsoc/tor-weather/contents.lr   | 2 +-
 11 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr 
b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
index 2263ecc..c5daeb4 100644
--- a/content/gsoc/cloudflare-captcha-monitoring/contents.lr
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -17,7 +17,7 @@ key: 1
 languages:
 javascript
 ---
-mentors: arma, gk
+mentors: GeKo, arma
 ---
 difficulty: medium
 ---
diff --git a/content/gsoc/gettor-distribution/contents.lr 
b/content/gsoc/gettor-distribution/contents.lr
index d0b7030..19213f2 100644
--- a/content/gsoc/gettor-distribution/contents.lr
+++ b/content/gsoc/gettor-distribution/contents.lr
@@ -12,7 +12,7 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 1
+key: 2
 ---
 languages: python
 ---
diff --git a/content/gsoc/onion-toolbox/contents.lr 
b/content/gsoc/onion-toolbox/contents.lr
index 7968f31..ed8b5e4 100644
--- a/content/gsoc/onion-toolbox/contents.lr
+++ b/content/gsoc/onion-toolbox/contents.lr
@@ -12,7 +12,7 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 1
+key: 3
 ---
 languages:
 Python
diff --git a/content/gsoc/ooni-explorer-advanced-search/contents.lr 
b/content/gsoc/ooni-explorer-advanced-search/contents.lr
index bcb3cd4..99b9484 100644
--- a/content/gsoc/ooni-explorer-advanced-search/contents.lr
+++ b/content/gsoc/ooni-explorer-advanced-search/contents.lr
@@ -12,7 +12,7 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 1
+key: 4
 ---
 languages: React
 ---
diff --git a/content/gsoc/ooni-probe-experiments/contents.lr 
b/content/gsoc/ooni-probe-experiments/contents.lr
index 45dc216..8f18dcc 100644
--- a/content/gsoc/ooni-probe-experiments/contents.lr
+++ b/content/gsoc/ooni-probe-experiments/contents.lr
@@ -12,7 +12,7 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 1
+key: 5
 ---
 languages: Golang
 ---
diff --git a/content/gsoc/privacy-aware-geo-lookup/contents.lr 
b/content/gsoc/privacy-aware-geo-lookup/contents.lr
index 4fd5451..d0ba616 100644
--- a/content/gsoc/privacy-aware-geo-lookup/contents.lr
+++ b/content/gsoc/privacy-aware-geo-lookup/contents.lr
@@ -12,9 +12,11 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 1
+key: 6
 ---
-languages: Golang, Java
+languages: 
+Golang
+Java
 ---
 org: OONI
 ---
diff --git a/content/gsoc/privacy-friendly-web/contents.lr 
b/content/gsoc/privacy-friendly-web/contents.lr
index fb32b0f..c56e209 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -12,7 +12,7 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 1
+key: 7
 ---
 languages:
 javascript
diff --git a/content/gsoc/salmon-bridge-distribution/contents.lr 
b/content/gsoc/salmon-bridge-distribution/contents.lr
index 4952c99..11855dc 100644
--- a/content/gsoc/salmon-bridge-distribution/contents.lr
+++ b/content/gsoc/salmon-bridge-distribution/contents.lr
@@ -12,7 +12,7 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 1
+key: 8
 ---
 languages: 
 ---
@@ -22,7 +22,7 @@ mentors:
 ---
 difficulty: 
 ---
-title: 
+title: Implementing Salmon as a bridge distribution mechanism
 ---
 subtitle:
 
diff --git a/content/gsoc/snowflake-android-proxy/contents.lr 
b/content/gsoc/snowflake-android-proxy/contents.lr
index f99b301..96f802b 100644
--- a/content/gsoc/snowflake-android-proxy/contents.lr
+++ b/content/gsoc/snowflake-android-proxy/contents.lr
@@ -12,9 +12,10 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 1
+key: 9
 ---
 languages: 
+Android
 ---
 org: Tor
 ---
diff --git a/content/gsoc/tor-relay-ipv6-support/contents.lr 
b/content/gsoc/tor-relay-ipv6-support/contents.lr
index 1300b87..4aff974 100644
--- a/content/gsoc/tor-relay-ipv6-support/contents.lr
+++ b/content/gsoc/tor-relay-ipv6-support/contents.lr
@@ -12,7 +12,7 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 1
+key: 10
 ---
 languages:
 C
diff --git a/content/gsoc/tor-weather/contents.lr 
b/content/gsoc/tor-weather/contents.lr
index 0c69dec..01bb416 100644
--- a/content/gsoc/tor-weather/contents.lr
+++ b/content/gsoc/tor-weather/contents.lr
@@ -12,7 +12,7 @@ section_id: gsoc
 ---
 color: primary
 ---
-key: 2
+key: 11
 ---
 languages

[tor-commits] [community/master] Add some more projects

[pili]

commit 3b8d7d9c8c9e97145972678666fe124b5b1e97d8
Author: Pili Guerra 
Date:   Thu Jan 30 16:08:11 2020 +0100

Add some more projects
---
 content/gsoc/gettor-distribution/contents.lr   | 35 +++
 .../gsoc/ooni-explorer-advanced-search/contents.lr | 51 ++
 content/gsoc/ooni-probe-experiments/contents.lr| 41 +
 content/gsoc/privacy-aware-geo-lookup/contents.lr  | 43 ++
 .../gsoc/salmon-bridge-distribution/contents.lr| 37 
 content/gsoc/snowflake-android-proxy/contents.lr   | 38 
 6 files changed, 245 insertions(+)

diff --git a/content/gsoc/gettor-distribution/contents.lr 
b/content/gsoc/gettor-distribution/contents.lr
new file mode 100644
index 000..d0b7030
--- /dev/null
+++ b/content/gsoc/gettor-distribution/contents.lr
@@ -0,0 +1,35 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 1
+---
+languages: python
+---
+org: Tor
+---
+mentors: cohos, hiro
+---
+difficulty: 
+---
+title: Implement a new distribution methods for GetTor
+---
+subtitle:
+
+This project would implement a feature to distribute Tor Browser downloads 
through Telegram or Facebook messenger.
+
+---
+body:
+
+
+Tor Browser ships with a few different anti-censorship tools to allow people 
free and open access to Internet content. However, some places censor Tor 
Browser downloads, making it difficult for users to install it in the first 
place. GetTor is a system for distributing Tor Browser using alternative 
methods such as email or Twitter to send users authenticated links to Tor 
Browser binaries. We are looking to expand the ways in which GetTor distributes 
these binaries. This project would implement a feature to distribute Tor 
Browser downloads through Telegram or Facebook messenger.
\ No newline at end of file
diff --git a/content/gsoc/ooni-explorer-advanced-search/contents.lr 
b/content/gsoc/ooni-explorer-advanced-search/contents.lr
new file mode 100644
index 000..bcb3cd4
--- /dev/null
+++ b/content/gsoc/ooni-explorer-advanced-search/contents.lr
@@ -0,0 +1,51 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 1
+---
+languages: React
+---
+org: OONI
+---
+mentors: Federico Ceratto, Arturo Filastò
+---
+difficulty: Medium
+---
+title: OONI Explorer Advanced Search
+---
+subtitle:
+
+This project is about enriching the OONI Explorer search functionality with 
the ability to visualize an analysis of metadata pertaining to filtered 
measurements.
+
+---
+body:
+
+This would involve adding the ability to filter on multiple axis: country, 
ASN, time range, anomaly, confirmed, failure, domain or input, citizenlab 
category code.
+
+The results would then be presented in an aggregate form, such as showing:
+
+- The total measurement count
+- The anomaly vs total ratio
+- Confirmed vs total
+- Failure vs total
+
+These results could then be presented as a table or some other charts, such as 
a heatmat.
+
+Some other more detailed, drill-down views could also be implemented.
+
+A potential applicant should also have some prior design 
+
+- *Prerequisites:* API call to be implemented by Federico
+- *Links/Resource:* https://github.com/ooni/explorer
+
diff --git a/content/gsoc/ooni-probe-experiments/contents.lr 
b/content/gsoc/ooni-probe-experiments/contents.lr
new file mode 100644
index 000..45dc216
--- /dev/null
+++ b/content/gsoc/ooni-probe-experiments/contents.lr
@@ -0,0 +1,41 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 1
+---
+languages: Golang
+---
+org: OONI
+---
+mentors: Simone Basso, Arturo Filastò
+---
+difficulty: low-high
+---
+title: OONI Probe network experiments
+---
+subtitle:
+
+As part of this project you would be working on researching and developing new 
OONI Probe network experiments.
+
+---
+body:
+
+These experiments would be integrated inside of probe-engine and could 
eventually make their way into the OONI Probe desktop client.
+
+The GSoC project is only about researching and implementing a working test in 
probe-engine, not the UI and client integration of the test.
+
+For some inspiration on some ideas for new experiments, see: 
https://github.com/ooni/probe-engine/issues?q=is%3Aopen+is%3Aissue+label%3A%22new+experiment%22
+
+Prerequisites: Knowledge of network programming
+Links/Resources: https://github.com/ooni/probe-engine
\ No newline at end of file
diff --git a/content/gsoc/privacy-aware-geo-lookup/contents.lr 
b/content/gsoc/privacy-aware-geo-lookup/contents.lr
new file mode 100644
index 000..4fd5451
--- /dev/null
+++ b/content/gsoc/privacy-aware-geo-lookup/contents.lr
@@ -0,0 +1,43 @@
+_model

[tor-commits] [community/master] Minor display fixes

[pili]

commit c5053398fdd93b7d4819f7bdf6ddd352957c165c
Author: Pili Guerra 
Date:   Thu Jan 30 16:07:01 2020 +0100

Minor display fixes
---
 content/gsoc/contents.lr   | 2 +-
 templates/macros/projects.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/gsoc/contents.lr b/content/gsoc/contents.lr
index 25d1562..a74dc57 100644
--- a/content/gsoc/contents.lr
+++ b/content/gsoc/contents.lr
@@ -10,7 +10,7 @@ html: gsoc.html
 ---
 color: primary
 ---
-subtitle: Some projects ideas for GSoC.
+subtitle: Some project ideas for GSoC.
 ---
 cta: Get coding
 ---
diff --git a/templates/macros/projects.html b/templates/macros/projects.html
index d4da228..bbda578 100644
--- a/templates/macros/projects.html
+++ b/templates/macros/projects.html
@@ -10,7 +10,7 @@
   
   
 
-  {{ item.summary }}
+  {{ item.subtitle }}
   {{ _('Read more.') }}
 
   



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/master] Rewrote and reviewed cloudflare captcha monitoring project

[pili]

commit fdb8ba63730ccbf9c1debfbae46f78030d11b7f8
Author: Pili Guerra 
Date:   Tue Feb 4 11:29:13 2020 +0100

Rewrote and reviewed cloudflare captcha monitoring project
---
 .../gsoc/cloudflare-captcha-monitoring/contents.lr | 41 +++---
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr 
b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
index c5daeb4..332ca2a 100644
--- a/content/gsoc/cloudflare-captcha-monitoring/contents.lr
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -25,26 +25,43 @@ title: Cloudflare Captcha Monitoring
 ---
 subtitle:
 
-We should track the rate that cloudflare gives captchas to Tor users over time.
+This project should implement a mechanism to track the rate that Cloudflare 
fronted webpages return captchas to Tor users over time.
 
 ---
 body:
 
-My suggested way of doing that tracking is to sign up a very simple static 
webpage to be fronted by cloudflare, and then fetch it via Tor over time, and 
record and graph the rates of getting a captcha vs getting the real page.
+# Problem
 
-The reason for the "simple static page" is to make it really easy to 
distinguish whether we're getting hit with a captcha. The "distinguishing one 
dynamic web page from another" challenge makes exitmap tricky in the general 
case, but we can remove that variable here.
+A large number of Tor users report getting hit by infinite captcha loops when 
visiting webpages fronted by Cloudflare. This makes them feel punished for 
using Tor to protect their privacy and prevents them from legitimately 
accessing websites.
 
-One catch is that Cloudflare currently gives alt-svc headers in response to 
fetches from Tor addresses. So that means we need a web client that can follow 
alt-srv headers -- maybe we need a full Selenium like client?
+# Proposal
 
-Once we get the infrastructure set up, we would be smart to run a second one 
which is just wget or curl or lynx or something, i.e. which doesn't behave like 
Tor Browser, in order to be able to track the difference between how Cloudflare 
responds to Tor Browser vs other browsers.
+For this project we would like to track in practice how often Cloudflare 
fronted webpages return captchas to Tor clients.
 
-I imagine that Cloudflare should be internally tracking how they're handling 
Tor requests, but having a public tracker (a) gives the data to everybody, and 
(b) helps Cloudflare have a second opinion in case their internal data diverges 
from the public version.
+Our proposed approach consists of:
 
-The Berkeley ICSI group did research that included this sort of check:
-​https://www.freehaven.net/anonbib/#differential-ndss2016
-​https://www.freehaven.net/anonbib/#exit-blocking2017
-but what I have in mind here is essentially a simpler subset of this research, 
skipping the complicated part of "how do you tell what kind of response you 
got" and with an emphasis on automation and consistency.
+1. Setting up a very simple static webpage to be fronted by Cloudflare
+2. Write an application which  small client to periodically fetch this static 
webpage via Tor and record how often a captcha is returned
+3. Record and graph captcha vs real page rates
+4. Using the pre-existing architecture, run a second client that does not 
fetch this webpage via Tor. This will allow us to contrast and compare how 
Cloudflare responds to Tor Browser vs other browsers.
+5. Track and publish these details publicly
 
-There are two interesting metrics to track over time: one is the fraction of 
exit relays that are getting hit with captchas, and the other is the chance 
that a Tor client, choosing an exit relay in the normal weighted faction, will 
get hit by a captcha.
+There are two interesting metrics to track over time: 
 
-Then there are other interesting patterns to look for, e.g. "are certain IP 
addresses punished consistently and others never punished, or is whether you 
get a captcha much more probabilistic and transient?" And does that pattern 
change over time?
+- the fraction of exit relays that are getting hit with captchas, and
+- the chance that a Tor client, choosing an exit relay in the normal weighted 
faction, will get hit by a captcha.
+
+Then there are other interesting patterns to look for:
+
+- Are certain IP addresses punished consistently and others never punished?
+- Is whether you get a captcha much more probabilistic and transient?
+- Does that pattern change over time?
+
+# Resources
+
+There is pre-existing research by the Berkeley ICSI group which includes these 
sorts of checks:
+
+- https://www.freehaven.net/anonbib/#differential-ndss2016
+- https://www.freehaven.net/anonbib/#exit-blocking2017
+
+For the original ticket and discussion, please see ticket 
[#33010](http://bugs.torproject.org/33010)
\ No newline at end of file

___
tor-commits maili

[tor-commits] [community/master] Add Project Ideas for GSoC to Community Portal

[pili]

commit de6de2744026f461739e41fb790176f5a624dd97
Author: Pili Guerra 
Date:   Wed Jan 22 13:04:16 2020 +0100

Add Project Ideas for GSoC to Community Portal

Fix gosc template and contents files

Change contents files for a few projects

Fix gsoc template
---
 .../gsoc/cloudflare-captcha-monitoring/contents.lr | 49 
 content/gsoc/contents.lr   | 21 +
 content/gsoc/onion-toolbox/contents.lr | 60 +++
 content/gsoc/privacy-friendly-web/contents.lr  | 45 +++
 content/gsoc/tor-relay-ipv6-support/contents.lr| 58 ++
 content/gsoc/tor-weather/contents.lr   | 90 ++
 models/project.ini | 51 
 models/projects.ini| 33 
 templates/gsoc.html| 24 ++
 templates/macros/projects.html | 16 
 templates/project.html | 49 
 11 files changed, 496 insertions(+)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr 
b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
new file mode 100644
index 000..e5b71a5
--- /dev/null
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -0,0 +1,49 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 1
+---
+languages: javascript
+---
+mentors: arma, gk
+---
+difficulty: medium
+---
+title: Cloudflare Captcha Monitoring
+---
+subtitle:
+
+We should track the rate that cloudflare gives captchas to Tor users over time.
+
+---
+body:
+
+My suggested way of doing that tracking is to sign up a very simple static 
webpage to be fronted by cloudflare, and then fetch it via Tor over time, and 
record and graph the rates of getting a captcha vs getting the real page.
+
+The reason for the "simple static page" is to make it really easy to 
distinguish whether we're getting hit with a captcha. The "distinguishing one 
dynamic web page from another" challenge makes exitmap tricky in the general 
case, but we can remove that variable here.
+
+One catch is that Cloudflare currently gives alt-svc headers in response to 
fetches from Tor addresses. So that means we need a web client that can follow 
alt-srv headers -- maybe we need a full Selenium like client?
+
+Once we get the infrastructure set up, we would be smart to run a second one 
which is just wget or curl or lynx or something, i.e. which doesn't behave like 
Tor Browser, in order to be able to track the difference between how Cloudflare 
responds to Tor Browser vs other browsers.
+
+I imagine that Cloudflare should be internally tracking how they're handling 
Tor requests, but having a public tracker (a) gives the data to everybody, and 
(b) helps Cloudflare have a second opinion in case their internal data diverges 
from the public version.
+
+The Berkeley ICSI group did research that included this sort of check:
+​https://www.freehaven.net/anonbib/#differential-ndss2016
+​https://www.freehaven.net/anonbib/#exit-blocking2017
+but what I have in mind here is essentially a simpler subset of this research, 
skipping the complicated part of "how do you tell what kind of response you 
got" and with an emphasis on automation and consistency.
+
+There are two interesting metrics to track over time: one is the fraction of 
exit relays that are getting hit with captchas, and the other is the chance 
that a Tor client, choosing an exit relay in the normal weighted faction, will 
get hit by a captcha.
+
+Then there are other interesting patterns to look for, e.g. "are certain IP 
addresses punished consistently and others never punished, or is whether you 
get a captcha much more probabilistic and transient?" And does that pattern 
change over time?
diff --git a/content/gsoc/contents.lr b/content/gsoc/contents.lr
new file mode 100644
index 000..1e973f0
--- /dev/null
+++ b/content/gsoc/contents.lr
@@ -0,0 +1,21 @@
+_template: layout.html
+---
+section: GSoC
+---
+section_id: gsoc
+---
+html: gsoc.html
+---
+color: primary
+---
+subtitle: Some projects ideas for GSoC.
+---
+cta: Get coding
+---
+key: 0
+---
+title: Project Ideas
+---
+body:
+
+You may find some of these projects to be good ideas for Google Summer of 
Code. We have labelled each idea with which of our core developers would be 
good mentors. If one or more of these ideas looks promising to you, please 
contact us to discuss your plans rather than sending blind applications.
diff --git a/content/gsoc/onion-toolbox/contents.lr 
b/content/gsoc/onion-toolbox/contents.lr
new file mode 100644
index 000..b9f50bc
--- /dev/null
+++ b/content/gsoc/onion-toolbox/contents.lr
@@ -0,0 +1,60 @@
+_model: project
+---
+_template: layout.html
+---
+html: two-columns-page.htm

[tor-commits] [community/staging] Add Project Ideas for GSoC to Community Portal

[pili]

commit 6df982765bb09b7c09a82c9afd0e1ecd309bb50e
Author: Pili Guerra 
Date:   Wed Jan 22 13:04:16 2020 +0100

Add Project Ideas for GSoC to Community Portal
---
 .../gsoc/cloudflare-captcha-monitoring/contents.lr | 47 +++
 content/gsoc/contents.lr   | 17 
 content/gsoc/onion-toolbox/contents.lr | 58 ++
 content/gsoc/privacy-friendly-web/contents.lr  | 44 +++
 content/gsoc/tor-relay-ipv6-support/contents.lr| 56 ++
 content/gsoc/tor-weather/contents.lr   | 90 ++
 models/project.ini | 43 +++
 models/projects.ini| 33 
 templates/gsoc.html| 41 ++
 templates/macros/projects.html | 16 
 templates/project.html | 49 
 11 files changed, 494 insertions(+)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr 
b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
new file mode 100644
index 000..e6ba0d5
--- /dev/null
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -0,0 +1,47 @@
+_model: project
+---
+_template: project.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 1
+---
+languages: javascript
+---
+mentors: arma, gk
+---
+difficulty: medium
+---
+title: Cloudflare Captcha Monitoring
+---
+summary:
+
+We should track the rate that cloudflare gives captchas to Tor users over time.
+
+---
+description: 
+
+My suggested way of doing that tracking is to sign up a very simple static 
webpage to be fronted by cloudflare, and then fetch it via Tor over time, and 
record and graph the rates of getting a captcha vs getting the real page.
+
+The reason for the "simple static page" is to make it really easy to 
distinguish whether we're getting hit with a captcha. The "distinguishing one 
dynamic web page from another" challenge makes exitmap tricky in the general 
case, but we can remove that variable here.
+
+One catch is that Cloudflare currently gives alt-svc headers in response to 
fetches from Tor addresses. So that means we need a web client that can follow 
alt-srv headers -- maybe we need a full Selenium like client?
+
+Once we get the infrastructure set up, we would be smart to run a second one 
which is just wget or curl or lynx or something, i.e. which doesn't behave like 
Tor Browser, in order to be able to track the difference between how Cloudflare 
responds to Tor Browser vs other browsers.
+
+I imagine that Cloudflare should be internally tracking how they're handling 
Tor requests, but having a public tracker (a) gives the data to everybody, and 
(b) helps Cloudflare have a second opinion in case their internal data diverges 
from the public version.
+
+The Berkeley ICSI group did research that included this sort of check:
+​https://www.freehaven.net/anonbib/#differential-ndss2016
+​https://www.freehaven.net/anonbib/#exit-blocking2017
+but what I have in mind here is essentially a simpler subset of this research, 
skipping the complicated part of "how do you tell what kind of response you 
got" and with an emphasis on automation and consistency.
+
+There are two interesting metrics to track over time: one is the fraction of 
exit relays that are getting hit with captchas, and the other is the chance 
that a Tor client, choosing an exit relay in the normal weighted faction, will 
get hit by a captcha.
+
+Then there are other interesting patterns to look for, e.g. "are certain IP 
addresses punished consistently and others never punished, or is whether you 
get a captcha much more probabilistic and transient?" And does that pattern 
change over time?
\ No newline at end of file
diff --git a/content/gsoc/contents.lr b/content/gsoc/contents.lr
new file mode 100644
index 000..2e4ffb5
--- /dev/null
+++ b/content/gsoc/contents.lr
@@ -0,0 +1,17 @@
+_template: layout.html
+---
+section: GSoC
+---
+section_id: gsoc
+---
+html: gsoc.html
+---
+color: primary
+---
+key: 0
+---
+title: Project Ideas
+---
+body:
+
+You may find some of these projects to be good ideas for Google Summer of 
Code. We have labelled each idea with which of our core developers would be 
good mentors. If one or more of these ideas looks promising to you, please 
contact us to discuss your plans rather than sending blind applications.
\ No newline at end of file
diff --git a/content/gsoc/onion-toolbox/contents.lr 
b/content/gsoc/onion-toolbox/contents.lr
new file mode 100644
index 000..a551ba8
--- /dev/null
+++ b/content/gsoc/onion-toolbox/contents.lr
@@ -0,0 +1,58 @@
+_model: project
+---
+_template: project.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 1
+---
+languages: javascript
+---
+mentors: hiro, asn
+---
+difficulty: medium
+---
+title: 

[tor-commits] [community/develop] Proposed layout

[pili]

commit 229a747f897f90469dd74169dd0445bf420348e9
Author: Pili Guerra 
Date:   Wed Jan 22 16:31:54 2020 +0100

Proposed layout
---
 content/gsoc/privacy-friendly-web/contents.lr |  2 +-
 templates/project.html| 34 ++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/content/gsoc/privacy-friendly-web/contents.lr 
b/content/gsoc/privacy-friendly-web/contents.lr
index 4aa6016..c37fbbe 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -1,6 +1,6 @@
 _model: project
 ---
-_template: layout.html
+_template: project.html
 ---
 active: True
 ---
diff --git a/templates/project.html b/templates/project.html
index eae2c56..7d16334 100644
--- a/templates/project.html
+++ b/templates/project.html
@@ -1 +1,33 @@
-{{ this.title }}
\ No newline at end of file
+
+{% include 'meta.html' %}
+
+  
+{% include 'navbar.html' %}
+  
+  
+{% include 'header.html' %}
+{% include 'pagenav.html' %}
+
+  
+
+ 
+  {{ this.summary }}
+
+
+  {{ this.description }}
+
+  
+
+
+  
+
+  {{ _("Back to ") }}{{ 
this.parent.title }}
+
+  
+
+  
+
+
+  {% include 'footer.html' %}
+
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] [WIP] Working on page layouts

[pili]

commit 184438ad54a77ef2c3b9fb26cbdc8c06f56146ad
Author: Pili Guerra 
Date:   Wed Jan 22 16:05:44 2020 +0100

[WIP] Working on page layouts
---
 content/gsoc/contents.lr  |  4 +++-
 content/gsoc/privacy-friendly-web/contents.lr |  6 +-
 content/gsoc/tor-weather/contents.lr  |  4 
 templates/gsoc.html   | 19 ++-
 templates/layout.html |  9 +
 templates/macros/projects.html|  1 +
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/content/gsoc/contents.lr b/content/gsoc/contents.lr
index fcf4597..2e4ffb5 100644
--- a/content/gsoc/contents.lr
+++ b/content/gsoc/contents.lr
@@ -1,4 +1,4 @@
-_template: gsoc.html
+_template: layout.html
 ---
 section: GSoC
 ---
@@ -8,6 +8,8 @@ html: gsoc.html
 ---
 color: primary
 ---
+key: 0
+---
 title: Project Ideas
 ---
 body:
diff --git a/content/gsoc/privacy-friendly-web/contents.lr 
b/content/gsoc/privacy-friendly-web/contents.lr
index 0a9e83b..4aa6016 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -1,6 +1,6 @@
 _model: project
 ---
-_template: project.html
+_template: layout.html
 ---
 active: True
 ---
@@ -10,6 +10,10 @@ section_id: gsoc
 ---
 color: primary
 ---
+key: 1
+---
+languages: javascript
+---
 title: Privacy Friendly Web
 ---
 summary:
diff --git a/content/gsoc/tor-weather/contents.lr 
b/content/gsoc/tor-weather/contents.lr
index 8a07c11..f1bebd7 100644
--- a/content/gsoc/tor-weather/contents.lr
+++ b/content/gsoc/tor-weather/contents.lr
@@ -10,6 +10,10 @@ section_id: gsoc
 ---
 color: primary
 ---
+key: 2
+---
+languages: TBD
+---
 title: Tor Weather
 ---
 summary:
diff --git a/templates/gsoc.html b/templates/gsoc.html
index 5bd3c59..2d66065 100644
--- a/templates/gsoc.html
+++ b/templates/gsoc.html
@@ -1,13 +1,4 @@
-
-{% include 'meta.html' %}
-
-  
-{% include 'navbar.html' %}
-  
-  
-{% include 'header.html' %}
-{% include 'pagenav.html' %}
-
+  {% include 'breadcrumb.html' %}
   
 
 
@@ -45,12 +36,6 @@
   {{ _('None of these ideas seem appealing? You may also want 
to propose your own project idea — which often results in the best 
projects.') }} {{ _('We invite you to contact us to discuss 
your own project idea.') }}
 
   
-
 
   
-
-  
-  
-{% include 'footer.html' %}
-  
-
+
\ No newline at end of file
diff --git a/templates/layout.html b/templates/layout.html
index 663c51b..9ab5aa1 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -10,7 +10,16 @@
 
   
 
+{% if this.parent.path == "/gsoc" %}
+   
+  {{ this.summary }}
+
+
+  {{ this.description }}
+
+ {% else %}
   {% include this.html %}
+{% endif %}
 
   
 
diff --git a/templates/macros/projects.html b/templates/macros/projects.html
index a027cfb..99e102b 100644
--- a/templates/macros/projects.html
+++ b/templates/macros/projects.html
@@ -4,6 +4,7 @@
 
   {{ item.title }}
 
+{{ item.languages }}
   
   
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Refining model

[pili]

commit f7e05b588a3c4675f93285236682588f08402391
Author: Pili Guerra 
Date:   Wed Jan 22 17:29:04 2020 +0100

Refining model
---
 content/gsoc/privacy-friendly-web/contents.lr |  4 
 content/gsoc/tor-weather/contents.lr  |  6 +-
 models/project.ini|  8 
 templates/layout.html |  9 -
 templates/project.html| 16 
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/content/gsoc/privacy-friendly-web/contents.lr 
b/content/gsoc/privacy-friendly-web/contents.lr
index c37fbbe..da9cc13 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -14,6 +14,10 @@ key: 1
 ---
 languages: javascript
 ---
+mentors: hiro
+---
+difficulty: medium
+---
 title: Privacy Friendly Web
 ---
 summary:
diff --git a/content/gsoc/tor-weather/contents.lr 
b/content/gsoc/tor-weather/contents.lr
index f1bebd7..9c7faa6 100644
--- a/content/gsoc/tor-weather/contents.lr
+++ b/content/gsoc/tor-weather/contents.lr
@@ -14,6 +14,10 @@ key: 2
 ---
 languages: TBD
 ---
+mentors: karsten
+---
+difficulty: medium
+---
 title: Tor Weather
 ---
 summary:
@@ -23,4 +27,4 @@ Summary of project
 ---
 description: 
 
-Longer description
\ No newline at end of file
+Longer description
diff --git a/models/project.ini b/models/project.ini
index a926b5c..8b286a0 100644
--- a/models/project.ini
+++ b/models/project.ini
@@ -32,4 +32,12 @@ type = string
 
 [fields.languages]
 label = Languages 
+type = string
+
+[fields.mentors]
+label = Mentors
+type = string
+
+[fields.difficulty]
+label = Difficulty Level
 type = string
\ No newline at end of file
diff --git a/templates/layout.html b/templates/layout.html
index 9ab5aa1..663c51b 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -10,16 +10,7 @@
 
   
 
-{% if this.parent.path == "/gsoc" %}
-   
-  {{ this.summary }}
-
-
-  {{ this.description }}
-
- {% else %}
   {% include this.html %}
-{% endif %}
 
   
 
diff --git a/templates/project.html b/templates/project.html
index 7d16334..1aaed71 100644
--- a/templates/project.html
+++ b/templates/project.html
@@ -11,10 +11,26 @@
   
 
  
+  Project Title: {{ this.title }}
+  {{ this.languages }} {{ this.difficulty }}
+
+ 
+  Project Summary:
+  
   {{ this.summary }}
+
 
 
+  Project Description:
+  
   {{ this.description }}
+
+
+
+  Mentors:
+  
+  {{ this.mentors }}
+
 
   
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Add starter project ideas

[pili]

commit b0158db91a3f99e7e664b9d1577f4374947546d7
Author: Pili Guerra 
Date:   Wed Jan 22 17:59:56 2020 +0100

Add starter project ideas
---
 .../gsoc/cloudflare-captcha-monitoring/contents.lr | 47 
 content/gsoc/onion-toolbox/contents.lr | 58 
 content/gsoc/tor-relay-ipv6-support/contents.lr| 56 +++
 content/gsoc/tor-weather/contents.lr   | 64 +-
 4 files changed, 223 insertions(+), 2 deletions(-)

diff --git a/content/gsoc/cloudflare-captcha-monitoring/contents.lr 
b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
new file mode 100644
index 000..e6ba0d5
--- /dev/null
+++ b/content/gsoc/cloudflare-captcha-monitoring/contents.lr
@@ -0,0 +1,47 @@
+_model: project
+---
+_template: project.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 1
+---
+languages: javascript
+---
+mentors: arma, gk
+---
+difficulty: medium
+---
+title: Cloudflare Captcha Monitoring
+---
+summary:
+
+We should track the rate that cloudflare gives captchas to Tor users over time.
+
+---
+description: 
+
+My suggested way of doing that tracking is to sign up a very simple static 
webpage to be fronted by cloudflare, and then fetch it via Tor over time, and 
record and graph the rates of getting a captcha vs getting the real page.
+
+The reason for the "simple static page" is to make it really easy to 
distinguish whether we're getting hit with a captcha. The "distinguishing one 
dynamic web page from another" challenge makes exitmap tricky in the general 
case, but we can remove that variable here.
+
+One catch is that Cloudflare currently gives alt-svc headers in response to 
fetches from Tor addresses. So that means we need a web client that can follow 
alt-srv headers -- maybe we need a full Selenium like client?
+
+Once we get the infrastructure set up, we would be smart to run a second one 
which is just wget or curl or lynx or something, i.e. which doesn't behave like 
Tor Browser, in order to be able to track the difference between how Cloudflare 
responds to Tor Browser vs other browsers.
+
+I imagine that Cloudflare should be internally tracking how they're handling 
Tor requests, but having a public tracker (a) gives the data to everybody, and 
(b) helps Cloudflare have a second opinion in case their internal data diverges 
from the public version.
+
+The Berkeley ICSI group did research that included this sort of check:
+​https://www.freehaven.net/anonbib/#differential-ndss2016
+​https://www.freehaven.net/anonbib/#exit-blocking2017
+but what I have in mind here is essentially a simpler subset of this research, 
skipping the complicated part of "how do you tell what kind of response you 
got" and with an emphasis on automation and consistency.
+
+There are two interesting metrics to track over time: one is the fraction of 
exit relays that are getting hit with captchas, and the other is the chance 
that a Tor client, choosing an exit relay in the normal weighted faction, will 
get hit by a captcha.
+
+Then there are other interesting patterns to look for, e.g. "are certain IP 
addresses punished consistently and others never punished, or is whether you 
get a captcha much more probabilistic and transient?" And does that pattern 
change over time?
\ No newline at end of file
diff --git a/content/gsoc/onion-toolbox/contents.lr 
b/content/gsoc/onion-toolbox/contents.lr
new file mode 100644
index 000..a551ba8
--- /dev/null
+++ b/content/gsoc/onion-toolbox/contents.lr
@@ -0,0 +1,58 @@
+_model: project
+---
+_template: project.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+key: 1
+---
+languages: javascript
+---
+mentors: hiro, asn
+---
+difficulty: medium
+---
+title: Onion Tool Box
+---
+summary:
+
+Myonion is a developer tool box, providing a command line interface and a GUI 
to configure and deploy existing services via .onion. A minimal prototype for 
myonion already [exists](https://github.com/hiromipaw/myonion).
+
+Someone that may want to run an onion service can use the myonion wrapper app 
to start a .onion from their computer and sharea static website or a web 
application.
+
+Myonion can also be used to deploy the resulting configured app to a defined 
set of cloud providers.
+
+---
+description: 
+
+## Problem definition
+
+It is not necessarily difficult to use onion services, but it might be tricky 
to configure a web service to be offered via .onion so that it doesn’t leak 
sensitive information.
+
+There are detailed 
[guides](https://riseup.net/en/security/network-security/tor/onionservices-best-practices)
 available for users that would like to offer a web application via .onion and 
some tools have been developed to help service operators: discover known 
misconfiguration or [vulnerabilities](https://onionscan.org/) or deploy an 
[onion site](https://gi

[tor-commits] [community/develop] [WIP] Add Project Ideas for GSoC to Community Portal

[pili]

commit 1b523fe5c9b8f1565804fb9ceec473eb53f0eb22
Author: Pili Guerra 
Date:   Wed Jan 22 13:04:16 2020 +0100

[WIP] Add Project Ideas for GSoC to Community Portal
---
 content/gsoc/contents.lr  | 15 +++
 content/gsoc/privacy-friendly-web/contents.lr | 36 +
 content/gsoc/tor-weather/contents.lr  | 22 +++
 models/project.ini| 35 +
 models/projects.ini   | 33 
 templates/gsoc.html   | 56 +++
 templates/macros/projects.html| 15 +++
 templates/project.html|  1 +
 8 files changed, 213 insertions(+)

diff --git a/content/gsoc/contents.lr b/content/gsoc/contents.lr
new file mode 100644
index 000..fcf4597
--- /dev/null
+++ b/content/gsoc/contents.lr
@@ -0,0 +1,15 @@
+_template: gsoc.html
+---
+section: GSoC
+---
+section_id: gsoc
+---
+html: gsoc.html
+---
+color: primary
+---
+title: Project Ideas
+---
+body:
+
+You may find some of these projects to be good ideas for Google Summer of 
Code. We have labelled each idea with which of our core developers would be 
good mentors. If one or more of these ideas looks promising to you, please 
contact us to discuss your plans rather than sending blind applications.
\ No newline at end of file
diff --git a/content/gsoc/privacy-friendly-web/contents.lr 
b/content/gsoc/privacy-friendly-web/contents.lr
new file mode 100644
index 000..0a9e83b
--- /dev/null
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -0,0 +1,36 @@
+_model: project
+---
+_template: project.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+title: Privacy Friendly Web
+---
+summary:
+
+The scope of this project is creating a open-source community-driven browsable 
list of patterns and release a css/js framework that web developers can extend 
and use in their work.
+---
+description: 
+
+Security concerned web users take conscious steps to limit the amount of data 
they share with the websites visited and third party services.
+
+There are a number of security enhancing tools available. Some come in the 
form of browser extensions and javascript blockers, others are full fledged web 
browsers designed with providing extra security to their users.
+
+One of this is the Tor Browser. The Tor Browser was designed to provide 
privacy while surfing the web and defend users against both network and local 
forensic adversaries. There are two main categories of requirements that have 
been considered: Security Requirements, and Privacy Requirements. 
+
+Security Requirements are the minimum properties in order for a browser to be 
able to support Tor and similar privacy proxies safely. Privacy requirements 
are primarily concerned with reducing linkability: the ability for a user's 
activity on one site to be linked with their activity on another site without 
their knowledge or explicit consent. 
+
+Websites can work seamsly with the Tor Browser and other privacy enhancing 
browsers and tools if they adopt a series of respectful and ethical patterns.
+
+The Tor Browser is in fact, based on Mozilla's Extended Support Release (ESR) 
Firefox branch. We have a series of patches against this browser to enhance 
privacy and security. Browser behavior is additionally augmented through the 
Torbutton extension, and we also change a number of Firefox preferences from 
their defaults. 
+
+The Tor Project has developed over the years a set of web development 
guidelines that allow websites to work with security enhanced browsers without 
causing any or minimal functionality destruption to their users. These 
guidelines have been shaped in an internal styleguide that has been adopted 
across all torproject.org websites.
+
+We are now formalizing these web development patterns and some security 
concerns that need to be considered when developing websites for users surfing 
the web with security enhanced browsers and tools.
+
diff --git a/content/gsoc/tor-weather/contents.lr 
b/content/gsoc/tor-weather/contents.lr
new file mode 100644
index 000..8a07c11
--- /dev/null
+++ b/content/gsoc/tor-weather/contents.lr
@@ -0,0 +1,22 @@
+_model: project
+---
+_template: project.html
+---
+active: True
+---
+section: GSoC
+---
+section_id: gsoc
+---
+color: primary
+---
+title: Tor Weather
+---
+summary:
+
+Summary of project
+
+---
+description: 
+
+Longer description
\ No newline at end of file
diff --git a/models/project.ini b/models/project.ini
new file mode 100644
index 000..a926b5c
--- /dev/null
+++ b/models/project.ini
@@ -0,0 +1,35 @@
+[model]
+name = Project
+label = {{ this.title }}
+
+[fields.title]
+label = Title
+type = string
+
+[fields.link]
+label = Link
+type = url
+
+[fields.active]
+label = Active
+type = boolean
+
+[fields.summary]
+label = Summary
+type = markdown
+
+[fields.color]
+label = Color
+type = string

[tor-commits] [community/develop] Add gso email address

[pili]

commit 9a0558bae6d0c8ad06618e05fa48bbf4da08a50a
Author: Pili Guerra 
Date:   Wed Jan 22 18:04:11 2020 +0100

Add gso email address
---
 templates/gsoc.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/gsoc.html b/templates/gsoc.html
index 2d66065..1c1add9 100644
--- a/templates/gsoc.html
+++ b/templates/gsoc.html
@@ -33,7 +33,7 @@
   
 
 
-  {{ _('None of these ideas seem appealing? You may also want 
to propose your own project idea — which often results in the best 
projects.') }} {{ _('We invite you to contact us to discuss 
your own project idea.') }}
+  {{ _('None of these ideas seem appealing? You may also want 
to propose your own project idea — which often results in the best 
projects.') }} mailto:g...@torproject.org;>{{ _('We invite you to 
contact us to discuss your own project idea.') }}
 
   
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/master] Changelog link fixes

[pili]

commit 9d3ac28451a8c120ba4670495c05c97ab8fe835c
Author: Pili Guerra 
Date:   Mon Jan 20 15:03:52 2020 +0100

Changelog link fixes
---
 templates/download-tor.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/download-tor.html b/templates/download-tor.html
index 132ea86..546bf71 100644
--- a/templates/download-tor.html
+++ b/templates/download-tor.html
@@ -17,11 +17,13 @@
 {% set t = bag('versions', 'tor-stable') %}
 {% set a = bag('versions', 'tor-alpha') %}
 {% set download_link = 'https://dist.torproject.org/tor-' + t.version 
+ '.tar.gz' %}
+{% set changelog_link = 
'https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-' + t.version %}
 {% set sig_link = download_link + '.asc' %}
 {% set alpha_download_link = 'https://dist.torproject.org/tor-' + 
a.version + '.tar.gz' %}
 {% set alpha_sig_link = alpha_download_link + '.asc' %}
 
   {{ t.version }}
+  {{ _('Changelog') }}
   {{ 
_('Download') }} ({{ _('sig') }})
 
 {% if t.version != a.version %}

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/develop] Changelog link fixes

[pili]

commit 683c6cc50dc02429eb41c911eb465b0307bb08c6
Author: Pili Guerra 
Date:   Mon Jan 20 15:03:52 2020 +0100

Changelog link fixes
---
 templates/download-tor.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/download-tor.html b/templates/download-tor.html
index 132ea86..546bf71 100644
--- a/templates/download-tor.html
+++ b/templates/download-tor.html
@@ -17,11 +17,13 @@
 {% set t = bag('versions', 'tor-stable') %}
 {% set a = bag('versions', 'tor-alpha') %}
 {% set download_link = 'https://dist.torproject.org/tor-' + t.version 
+ '.tar.gz' %}
+{% set changelog_link = 
'https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-' + t.version %}
 {% set sig_link = download_link + '.asc' %}
 {% set alpha_download_link = 'https://dist.torproject.org/tor-' + 
a.version + '.tar.gz' %}
 {% set alpha_sig_link = alpha_download_link + '.asc' %}
 
   {{ t.version }}
+  {{ _('Changelog') }}
   {{ 
_('Download') }} ({{ _('sig') }})
 
 {% if t.version != a.version %}

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/master] We have filled the Shadow Simulation Developer position

[pili]

commit 71d1dd2cb9a560cb04c0b7cc5e60742270f3def2
Author: Pili Guerra 
Date:   Wed Jan 8 16:47:32 2020 +0100

We have filled the Shadow Simulation Developer position
---
 content/about/jobs/shadow-simulation-developer/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr 
b/content/about/jobs/shadow-simulation-developer/contents.lr
index 8fe07b5..11d2a0b 100644
--- a/content/about/jobs/shadow-simulation-developer/contents.lr
+++ b/content/about/jobs/shadow-simulation-developer/contents.lr
@@ -2,7 +2,7 @@ _model: job
 ---
 _template: about.html
 ---
-active: True
+active: False
 ---
 section: about
 ---

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Merge remote-tracking branch 'origin/master' into develop

[pili]

commit 53640c0c623268ce7374838375521acfe27952e1
Merge: 084aa98 110c22f
Author: Pili Guerra 
Date:   Mon Nov 18 14:40:24 2019 +0100

Merge remote-tracking branch 'origin/master' into develop

 assets/static/images/home/png/block-trackers.png   |  Bin 0 -> 18192 bytes
 .../static/images/home/png/block-track...@2x.png   |  Bin 0 -> 42047 bytes
 .../static/images/home/png/block-track...@3x.png   |  Bin 0 -> 66496 bytes
 assets/static/images/home/png/browse-freely.png|  Bin 0 -> 27282 bytes
 assets/static/images/home/png/browse-fre...@2x.png |  Bin 0 -> 62800 bytes
 assets/static/images/home/png/browse-fre...@3x.png |  Bin 0 -> 99137 bytes
 assets/static/images/home/png/encryption.png   |  Bin 0 -> 19727 bytes
 assets/static/images/home/png/encrypt...@2x.png|  Bin 0 -> 44050 bytes
 assets/static/images/home/png/encrypt...@3x.png|  Bin 0 -> 70895 bytes
 assets/static/images/home/png/fingerprinting.png   |  Bin 0 -> 28619 bytes
 .../static/images/home/png/fingerprint...@2x.png   |  Bin 0 -> 64240 bytes
 .../static/images/home/png/fingerprint...@3x.png   |  Bin 0 -> 100068 bytes
 assets/static/images/home/png/surveillance.png |  Bin 0 -> 18021 bytes
 assets/static/images/home/png/surveilla...@2x.png  |  Bin 0 -> 40297 bytes
 assets/static/images/home/png/surveilla...@3x.png  |  Bin 0 -> 63810 bytes
 assets/static/images/home/png/take-b...@3x.png |  Bin 0 -> 124543 bytes
 assets/static/images/home/svg/block-trackers.svg   |1 +
 assets/static/images/home/svg/browse-freely.svg|1 +
 assets/static/images/home/svg/encryption.svg   |1 +
 assets/static/images/home/svg/fingerprinting.svg   |1 +
 assets/static/images/home/svg/surveillance.svg |1 +
 assets/static/images/home/svg/take-back.svg| 7902 
 content/localization/contents.lr   |4 +-
 .../localization/translation-problem/contents.lr   |2 +-
 content/onion-services/contents.lr |2 +-
 content/onion-services/overview/contents.lr|   33 +-
 content/onion-services/setup/contents.lr   |   14 +-
 content/relay-operations/contents.lr   |2 +-
 .../technical-setup/bridge/docker/contents.lr  |   50 +-
 .../bridge/dragonflybsd/contents.lr|  145 +
 .../technical-setup/bridge/netbsd/contents.lr  |  100 +
 .../relay-operations/technical-setup/contents.lr   |2 +-
 .../technical-setup/exit/contents.lr   |   36 +-
 content/training/checklist/contents.lr |   20 +-
 content/training/faq/contents.lr   |   16 +-
 content/training/risks/contents.lr |   28 +-
 content/user-research/become-tester/contents.lr|   15 +-
 content/user-research/contents.lr  |   11 +-
 content/user-research/guidelines/contents.lr   |   76 +
 content/user-research/open/contents.lr |   47 +-
 content/user-research/persona/contents.lr  |   27 +
 databags/menu+bn-BD.ini|1 -
 databags/menu+de.ini   |1 -
 databags/menu+en.ini   |1 -
 databags/menu+es.ini   |1 -
 databags/menu+fr.ini   |1 -
 databags/menu+id.ini   |1 -
 databags/menu+is.ini   |1 -
 databags/menu+it.ini   |1 -
 databags/menu+ka.ini   |1 -
 databags/menu+ko.ini   |1 -
 databags/menu+pt-BR.ini|1 -
 databags/menu+ru.ini   |1 -
 databags/menu+tr.ini   |1 -
 databags/menu+zh-CN.ini|1 -
 databags/menu.ini  |1 +
 databags/menu_footer+bn-BD.ini |1 -
 databags/menu_footer+de.ini|1 -
 databags/menu_footer+en.ini|1 -
 databags/menu_footer+es.ini|1 -
 databags/menu_footer+fr.ini|1 -
 databags/menu_footer+id.ini|1 -
 databags/menu_footer+is.ini|1 -
 databags/menu_footer+it.ini|1 -
 databags/menu_footer+ka.ini|1 -
 databags/menu_footer+ko.ini|1 -
 databags/menu_footer+pt-BR.ini |1 -
 databags/menu_footer+ru.ini|1 -
 databags/menu_footer+tr.ini|1 -
 databags/menu_footer+zh-CN.ini |1 -
 databags/menu_footer.ini   |1 +
 databags/pagenav+de.ini|1 -
 databags/pagenav+es.ini|1 -
 databags/pagenav+fr.i

[tor-commits] [community/develop] Fix spelling mistakes and improve phrasing.

[pili]

commit f0439f0b1cec908bd8222eee1da79c32987abdca
Author: Philipp Winter 
Date:   Tue Nov 12 08:58:14 2019 -0800

Fix spelling mistakes and improve phrasing.
---
 .../technical-setup/exit/contents.lr   | 36 +++---
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/content/relay-operations/technical-setup/exit/contents.lr 
b/content/relay-operations/technical-setup/exit/contents.lr
index ee0148c..43d6f39 100644
--- a/content/relay-operations/technical-setup/exit/contents.lr
+++ b/content/relay-operations/technical-setup/exit/contents.lr
@@ -60,29 +60,29 @@ ExitRelay 1
 ## DNS on Exit Relays
 
 Unlike other types of relays, exit relays also do DNS resolution for Tor 
clients.
-DNS resolution on exit relays is crucial for Tor clients, it should be 
reliable and fast by using caching.
+DNS resolution on exit relays is crucial for Tor clients and it should be 
reliable and fast by using caching.
 
-* DNS resolution can have a significant impact on the performance and 
reliability your exit relay provides.
-  Poor DNS performance will result in less traffic going through your exit 
relay.
-* Don't use any of the big DNS resolvers as your primary or fallback DNS 
resolver to avoid centralization (Google, OpenDNS, Quad9, Cloudflare, 4.2.2.1-6)
-* We recommend running a local caching and DNSSEC-validating resolver without 
using any forwarders (specific instructions follow bellow for each operating 
systems)
-* If you want to add a second DNS resolver as a fallback to your 
/etc/resolv.conf configuration, try to choose a resolver within your autonomous 
system and make sure it is not your first entry in that file (the first entry 
should be your local resolver)
-* If a local resolver like unbound is not an option for you try to use a 
resolver that your provider runs in the same autonomous system (to find out if 
an IP address is in the same AS as your relay, you can look it up, using for 
example https://bgp.he.net).
-* Try to avoid adding too many resolvers to your /etc/resolv.conf file to 
limit exposure on an AS-level (try to not use more than two entries)
+* DNS resolution can have a significant impact on the performance and 
reliability that your exit relay provides.
+* Don't use any of the big DNS resolvers (Google, OpenDNS, Quad9, Cloudflare, 
4.2.2.1-6) as your primary or fallback DNS resolver to avoid centralization.
+* We recommend running a local caching and DNSSEC-validating resolver without 
using any forwarders (specific instructions follow below, for various operating 
systems).
+* If you want to add a second DNS resolver as a fallback to your 
/etc/resolv.conf configuration, choose a resolver within your autonomous system 
and make sure that it is not your first entry in that file (the first entry 
should be your local resolver).
+* If a local resolver like unbound is not an option for you, use a 
resolver that your provider runs in the same autonomous system (to find out if 
an IP address is in the same AS as your relay, you can look it up using 
[bgp.he.net](https://bgp.he.net)).
+* Avoid adding more than two resolvers to your /etc/resolv.conf file to limit 
AS-level exposure of DNS queries.
 
-There are multiple options for DNS server software, unbound has become a 
popular one but **feel free to use any other you are comfortable with**.
-When choosing your DNS resolver software try to ensure it supports DNSSEC 
validation and QNAME minimisation (RFC7816).
-In every case the software should be installed using the OS package manager to 
ensure it is updated with the rest of the system.
+There are multiple options for DNS server software. 
[Unbound](https://nlnetlabs.nl/projects/unbound/about/) has become
+a popular one but feel free to use any other software that you are comfortable 
with.
+When choosing your DNS resolver software, make sure that it supports DNSSEC 
validation and QNAME minimization (RFC7816).
+Install the resolver software over your operating system's package manager, to 
ensure that it is updated automatically.
 
-By using your own DNS resolver you are less vulnerable to DNS-based censorship 
that your upstream resolver might impose.
+By using your own DNS resolver, you are less vulnerable to DNS-based 
censorship that your upstream resolver might impose.
 
-Here follow specific instructions on how to install and configure unbound on 
your exit - a DNSSEC-validating and caching resolver. unbound has many 
configuration and tuning nobs but we try to keep these instructions as simple 
and short as possible and the basic setup will do just fine for most operators.
+Below are instructions on how to install and configure unbound – a 
DNSSEC-validating and caching resolver – on your exit relay. Unbound has many 
configuration and tuning knobs but we keep these instructions simple and short; 
the basic setup will do just fine for most operators.
 
-After switching to unbound verify it works as expected by resolving a 

[tor-commits] [community/develop] Update lego

[pili]

commit c0c07feb0a9d8830a8cf266794ed9ef0dc0104b4
Author: hiro 
Date:   Mon Nov 11 16:09:03 2019 +0100

Update lego
---
 databags/menu.ini| 1 +
 databags/menu_footer.ini | 1 +
 lego | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/databags/menu.ini b/databags/menu.ini
new file mode 12
index 000..94f62ff
--- /dev/null
+++ b/databags/menu.ini
@@ -0,0 +1 @@
+../lego/databags/menu.ini
\ No newline at end of file
diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini
new file mode 12
index 000..e6c1f3b
--- /dev/null
+++ b/databags/menu_footer.ini
@@ -0,0 +1 @@
+../lego/databags/menu_footer.ini
\ No newline at end of file
diff --git a/lego b/lego
index ae51128..07eaef9 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40
+Subproject commit 07eaef9800b90b8de1c490dedc95928d3b789cbf



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Update lego

[pili]

commit 88842f60c9a784262c2f01a63313e3cae534680f
Author: hiro 
Date:   Wed Nov 13 16:55:05 2019 +0100

Update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 6a550fa..bbf8108 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 6a550faea39a534af47923a01bd29d138365819f
+Subproject commit bbf8108b622ef4c8b1d96b9790fc3e77aa1c030f



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Improve docker setup instructions.

[pili]

commit bfe821bc6466793d8cffdec579b43df219dd28e5
Author: Philipp Winter 
Date:   Wed Oct 30 12:35:29 2019 -0700

Improve docker setup instructions.

This partially fixes: 
---
 .../technical-setup/bridge/docker/contents.lr  | 50 +++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr 
b/content/relay-operations/technical-setup/bridge/docker/contents.lr
index f82a65e..f401b1e 100644
--- a/content/relay-operations/technical-setup/bridge/docker/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr
@@ -6,17 +6,55 @@ title: Docker
 ---
 body:
 
-We are maintaining a docker container that allows you to quickly set up an 
obfs4 bridge. First, fetch the container:
+We are maintaining a docker container that runs an obfs4 bridge.  This guide
+walks you through setting up this container.  First, download the container:
 
-`docker pull phwinter/obfs4-bridge:latest`
+```
+docker pull phwinter/obfs4-bridge:latest
+```
 
-Now, it's time to run the container.  We maintain a script that automatically 
determines a free OR and obfs4 port for you. The script only requires your 
email address as argument:
+Now, it's time to run the container.  You can choose between two options:
+
+1. We maintain a script that determines a free OR and obfs4 port for you, and
+   then runs the docker container.
+   [Download the script 
here](https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/deploy-container.sh).
+   When running this script, provide your email address as argument:
+   ```
+   bash deploy-container.sh addr...@email.com
```
-   $ curl 
https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/deploy-container.sh
 > deploy-container.sh
-   $ bash deploy-container.sh addr...@email.com
+   The script will tell you what ports it chose, and your container ID.  Make
+   sure that **both** ports are forwarded in your firewall.
+
+2. If you would rather provide your own ports, run the following command and
+   replace `XXX` with your OR port, `YYY` with your obfs4 port, and
+   `ad...@example.com` with your email address.
+
```
+OR_PORT=XXX PT_PORT=YYY EMAIL=ad...@example.com; docker run -d -e 
OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p 
$PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest
+```
+
+Again, make sure that **both** ports are forwarded by your firewall.
+
+That's it! Your container should now be bootstrapping your new obfs4 bridge.
+You can inspect its logs by running:
+
+```
+docker logs CONTAINER_ID
+```
+
+To use your new bridge in Tor Browser, you need its "bridge line".  Here's how
+you can get your bridge line:
+
+```
+docker exec CONTAINER_ID get-bridge-line
+```
+
+This will return a string similar to the following:
+
+```
+obfs4 1.2.3.4:1234 B0E566C9031657EA7ED3FC9D248E8AC4F37635A4 
cert=OYWq67L7MDApdJCctUAF7rX8LHvMxvIBPHOoAp0+YXzlQdsxhw6EapaMNwbbGICkpY8CPQ 
iat-mode=0
+```
 
-That's it! Your container should now be bootstrapping your new obfs4 Tor 
bridge.
 Make sure to check out the [post-install
 notes](https://community.torproject.org/relay/setup/bridge/post-install/).  If
 you are having troubles setting up your bridge, have a look at [our help



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] better strings for l10n. please add one sentence per line.

[pili]

commit d8e9c59d9311e93045db94c491a8615523a33bf8
Author: emma peel 
Date:   Thu Oct 31 15:41:39 2019 +0100

better strings for l10n. please add one sentence per line.
---
 content/user-research/contents.lr | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/content/user-research/contents.lr 
b/content/user-research/contents.lr
index 2ad1aeb..31b93ef 100644
--- a/content/user-research/contents.lr
+++ b/content/user-research/contents.lr
@@ -20,4 +20,7 @@ body:
 
 ## We respect our users' privacy when we conduct research.
 
-We practice human-centered design when we build tools for internet freedom. 
The way we build tools also builds community. Our user research is founded on 
the premises of consent, respect, and empathy. You can make an impact in your 
community by learning from our methods and helping us with user research.
+We practice human-centered design when we build tools for internet freedom.
+The way we build tools also builds community.
+Our user research is founded on the premises of consent, respect, and empathy.
+You can make an impact in your community by learning from our methods and 
helping us with user research.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Update lego

[pili]

commit d7439ded9c45796a0b872054aa25da72ef46eb22
Author: hiro 
Date:   Tue Nov 5 14:59:13 2019 +0100

Update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 8a4ddc7..ae51128 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5
+Subproject commit ae5112831f87ccbe9cccd7d9a11aaf5a8dde1f40



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] small edits

[pili]

commit 6577591736b8b16e90a48972ffe457d63f746012
Author: Stephanie A. Whited 
Date:   Fri Oct 11 20:04:39 2019 +

small edits
---
 content/onion-services/setup/contents.lr | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/content/onion-services/setup/contents.lr 
b/content/onion-services/setup/contents.lr
index a33df07..5389808 100644
--- a/content/onion-services/setup/contents.lr
+++ b/content/onion-services/setup/contents.lr
@@ -8,7 +8,7 @@ image: cloud-upload-alt
 ---
 _template: layout.html
 ---
-title: Set up your Onion Service
+title: Set up Your Onion Service
 ---
 subtitle: Learn how to set up a .onion site of your very own.
 ---
@@ -20,11 +20,11 @@ html: two-columns-page.html
 ---
 body:
 
-This guide will go over setting up an onion service for your website:
+This guide shows you how to set up an onion service for your website. 
 
 ## Step 0: Get a working Tor
 
-As part of this guide we will assume you have a functional Tor in your 
machine. Tor should be up and running correctly for this guide to work. You 
should also know where Tor's configuration files are.
+As part of this guide, we will assume you have a functional Tor in your 
machine. Tor should be up and running correctly for this guide to work. You 
should also know where Tor's configuration files are.
 
 To setup Tor, Windows users can follow the [Windows 
howto](https://2019.www.torproject.org/docs/tor-doc-windows.html.en), OS X 
users should follow the [OS X 
howto](https://2019.www.torproject.org/docs/tor-doc-osx.html.en), and 
Linux/BSD/Unix users should follow the [Unix 
howto](https://2019.www.torproject.org/docs/tor-doc-unix.html.en).
 
@@ -61,18 +61,18 @@ Now save your `torrc` and restart Tor.
 
 If Tor starts up again, great. Otherwise, something is wrong. First look at 
your logfiles for hints.
 It will print some warnings or error messages. That should give you an idea 
what went wrong.
-Typically there are typos in the torrc or wrong directory permissions (See the 
logging FAQ [FIXME add link] entry if you don't know how to enable or find your 
log file.)
+Typically, there are typos in the torrc or wrong directory permissions (See 
the logging FAQ [FIXME add link] entry if you don't know how to enable or find 
your log file.)
 
 When Tor starts, it will automatically create the `HiddenServiceDir` that you 
specified (if necessary). Make sure this is the case.
 
 ## Step 4: Test that your onion service works
 
 Now to get your onion service address, go to your `HiddenServiceDir` 
directory, and find a file named `hostname`.
-The `hostname` file in your hidden service configuration directory contains 
the hostname for your new Onion v3 hidden service.
+The `hostname` file in your hidden service configuration directory contains 
the hostname for your new onion v3 hidden service.
 The other files are your hidden service keys, so it is imperative that these 
are kept private.
-If your keys leak, other people can impersonate your hidden service, deeming 
it compromised, useless and dangerous to visit.
+If your keys leak, other people can impersonate your onion service, deeming it 
compromised, useless, and dangerous to visit.
 
-Now you can connect to your onion service using the Tor Browser and you should 
get the html page you setup back in step 1.
+Now you can connect to your onion service using Tor Browser, and you should 
get the html page you setup back in step 1.
 If it doesn't work, look in your logs for some hints, and keep playing with it 
until it works.
 
 ## Step 5: More advanced tips



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] slight grammar and flow edits

[pili]

commit 0b1d62e945bc050583c227e452e09cc3cfb31d2f
Author: Stephanie A. Whited 
Date:   Thu Oct 31 19:11:46 2019 +

slight grammar and flow edits
---
 content/training/risks/contents.lr | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/content/training/risks/contents.lr 
b/content/training/risks/contents.lr
index c1fea57..967ab61 100644
--- a/content/training/risks/contents.lr
+++ b/content/training/risks/contents.lr
@@ -5,27 +5,27 @@ title: Risks
 body:
 
 To our knowledge, no Tor trainer has ever faced consequences as a result of 
training others or speaking about Tor.
-However, in some countries and in certain circumstances, it's possible that a 
simply gathering of human rights defenders could be very risky, illegal or even 
subject of imprisonment, physical assaults, large fines, threats, placement on 
government watch lists and targeting for surveillance.
+However, in some countries and in certain circumstances, it's possible that 
simply a gathering of human rights defenders could be risky, illegal, or even 
subject someone to imprisonment, physical assaults, large fines, threats, 
placement on government watch lists, and targeting for surveillance.
 
-If you want to run a Tor training for the first time and you don't know how to 
assess the political and social environment, we strongly encourage you read 
this document and, in case of doubt, to reach out Tor Community Team privately.
+If you want to run a Tor training for the first time and you don't know how to 
assess the political and social environment, we strongly encourage you read 
this document and, in case of doubt, to reach out to the Tor Community Team 
privately.
 
-Some of potential risks of running a digital security training are only valid 
in specific contexts.
-Therefore the potential risks associated to running a Tor training depend on:
+Some potential risks of running a digital security training are only valid in 
specific contexts.
+The potential risks associated with running a Tor training depend on:
 
 1. **Your threat model.** A high-profile activist already under a lot of 
surveillance, for example, might attract more attention when reaching out other 
activists to run a digital security training.
-2. **The laws and regulations in the country.** Best to consult with local 
lawyers and local freedom of expression organizations, and learn whether your 
country has a record in prosecuting individuals engaging in similar types of 
activities.
+2. **The laws and regulations in the country.** Consult with local lawyers and 
local freedom of expression organizations and learn whether your country has a 
record in prosecuting individuals engaging in similar types of activities.
 3. **The types of training.** Not all trainings carry the same weight in terms 
of potential risk.
-   For example, talking about privacy on digital age might be appreciable, but 
teaching how to circumvent government censorship could be a serious felony.
-4. **The audience.** Gathering university students might not attract 
attention, but in case of a group of journalists working on leaked documents 
about government corruption, you might need to be extra careful on how to reach 
out them in a private way.
-5. **The training venue.** Running a Tor training in some spaces could expose 
your participants identity.
-   Ideally, you should use a private space that you can control the 
participants entrance.
-   Check before the training if participants are comfortable on revealing 
their identity to a third party, if it's the case.
+   For example, talking about privacy in the digital age might be appreciable, 
but teaching how to circumvent government censorship could be a serious felony.
+4. **The audience.** Gathering university students might not attract 
attention, but if you're gathering a group of journalists working with leaked 
documents about government corruption, you might need to be extra careful on 
how to reach out them in a private way.
+5. **The training venue.** Running a Tor training in some spaces could expose 
your participants' identities.
+   Ideally, you should use a private space where you control the participants' 
entrance.
+   If the space isn't private, check before the training to find out if 
participants are comfortable revealing their identity to a third party.
 
 ## Evaluating risks
 
 Some questions you may want to answer before running a digital security 
training include:
 
-* Has anyone in my country ever been criminalized based on their internet 
activity? (This does not necessarily need to be specific to digital security 
training or use of Tor)
+* Has anyone in my country ever been criminalized based on their internet 
activity? (This does not necessarily need to be specific to digital security 
training or use of Tor.)
 * Are there laws in my country that require Internet Service Providers (ISPs) 
to track my online activity?
 * Is it illegal for me to access 

[tor-commits] [community/develop] Remove unused menu and update template

[pili]

commit a5f03cebf373c48b3dd7516babce036adf31
Author: hiro 
Date:   Mon Nov 11 17:09:11 2019 +0100

Remove unused menu and update template
---
 databags/menu+bn-BD.ini  | 1 -
 databags/menu+de.ini | 1 -
 databags/menu+en.ini | 1 -
 databags/menu+es.ini | 1 -
 databags/menu+fr.ini | 1 -
 databags/menu+id.ini | 1 -
 databags/menu+is.ini | 1 -
 databags/menu+it.ini | 1 -
 databags/menu+ka.ini | 1 -
 databags/menu+ko.ini | 1 -
 databags/menu+pt-BR.ini  | 1 -
 databags/menu+ru.ini | 1 -
 databags/menu+tr.ini | 1 -
 databags/menu+zh-CN.ini  | 1 -
 databags/menu_footer+bn-BD.ini   | 1 -
 databags/menu_footer+de.ini  | 1 -
 databags/menu_footer+en.ini  | 1 -
 databags/menu_footer+es.ini  | 1 -
 databags/menu_footer+fr.ini  | 1 -
 databags/menu_footer+id.ini  | 1 -
 databags/menu_footer+is.ini  | 1 -
 databags/menu_footer+it.ini  | 1 -
 databags/menu_footer+ka.ini  | 1 -
 databags/menu_footer+ko.ini  | 1 -
 databags/menu_footer+pt-BR.ini   | 1 -
 databags/menu_footer+ru.ini  | 1 -
 databags/menu_footer+tr.ini  | 1 -
 databags/menu_footer+zh-CN.ini   | 1 -
 databags/pagenav+de.ini  | 1 -
 databags/pagenav+es.ini  | 1 -
 databags/pagenav+fr.ini  | 1 -
 databags/pagenav+it.ini  | 1 -
 databags/pagenav+pt-BR.ini   | 1 -
 databags/pagenav+ru.ini  | 1 -
 databags/{pagenav+en.ini => pagenav.ini} | 0
 lego | 2 +-
 templates/pagenav.html   | 2 +-
 37 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini
deleted file mode 12
index c9b2dc8..000
--- a/databags/menu+bn-BD.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+bn-BD.ini
\ No newline at end of file
diff --git a/databags/menu+de.ini b/databags/menu+de.ini
deleted file mode 12
index 6bb02de..000
--- a/databags/menu+de.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+de.ini
\ No newline at end of file
diff --git a/databags/menu+en.ini b/databags/menu+en.ini
deleted file mode 12
index 1fa7edf..000
--- a/databags/menu+en.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+en.ini
\ No newline at end of file
diff --git a/databags/menu+es.ini b/databags/menu+es.ini
deleted file mode 12
index fd8def3..000
--- a/databags/menu+es.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+es.ini
\ No newline at end of file
diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini
deleted file mode 12
index 5366289..000
--- a/databags/menu+fr.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+fr.ini
\ No newline at end of file
diff --git a/databags/menu+id.ini b/databags/menu+id.ini
deleted file mode 12
index 7c2858b..000
--- a/databags/menu+id.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+id.ini
\ No newline at end of file
diff --git a/databags/menu+is.ini b/databags/menu+is.ini
deleted file mode 12
index b02aed7..000
--- a/databags/menu+is.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+is.ini
\ No newline at end of file
diff --git a/databags/menu+it.ini b/databags/menu+it.ini
deleted file mode 12
index fcdde73..000
--- a/databags/menu+it.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+it.ini
\ No newline at end of file
diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini
deleted file mode 12
index 336d4ad..000
--- a/databags/menu+ka.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+ka.ini
\ No newline at end of file
diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini
deleted file mode 12
index 31e262b..000
--- a/databags/menu+ko.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+ko.ini
\ No newline at end of file
diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini
deleted file mode 12
index fd27afb..000
--- a/databags/menu+pt-BR.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+pt-BR.ini
\ No newline at end of file
diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini
deleted file mode 12
index 6f30a3e..000
--- a/databags/menu+ru.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+ru.ini
\ No newline at end of file
diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini
deleted file mode 12
index 8a01592..000
--- a/databags/menu+tr.ini
+++ /dev/null
@@ -1 +0,0 @@
-../lego/databags/menu+tr.ini
\ No newline at end of file
diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini
deleted file mode 12
index 425a6f8..000
--- a/databags/menu+zh-CN.ini
+++ /dev/null
@@ -1 

[tor-commits] [community/develop] Merge remote-tracking branch 'egypcio/torbsd-bridges'

[pili]

commit 27a800fa107b40e1c6d76fedd8028a6396863f83
Merge: d15ab1b 8187d99
Author: Philipp Winter 
Date:   Mon Oct 28 14:06:50 2019 -0700

Merge remote-tracking branch 'egypcio/torbsd-bridges'

 .../bridge/dragonflybsd/contents.lr| 145 +
 .../technical-setup/bridge/netbsd/contents.lr  | 100 ++
 2 files changed, 245 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Fix floating menu issue

[pili]

commit dbf5e4c0f1b0d39ab3c19d1cf7debddb716cc1f0
Author: Antonela 
Date:   Tue Nov 12 19:57:42 2019 +0900

Fix floating menu issue
---
 templates/pagenav.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/pagenav.html b/templates/pagenav.html
index 7d38397..617242d 100644
--- a/templates/pagenav.html
+++ b/templates/pagenav.html
@@ -1,4 +1,4 @@
-
+
   
 
   



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Not all pages are hidden

[pili]

commit b2df2aa3ca13e86af733e8b1c4257df83e8a8415
Author: hiro 
Date:   Mon Oct 21 18:16:26 2019 +0200

Not all pages are hidden
---
 content/user-research/become-tester/contents.lr | 2 ++
 templates/user-research.html| 8 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index 7025245..5dfa354 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -8,6 +8,8 @@ subtitle: We regularly release Tor Browser Alpha versions to 
allow users to test
 ---
 key: 1
 ---
+_hidden: yes
+---
 _template: layout.html
 ---
 html: two-columns-page.html
diff --git a/templates/user-research.html b/templates/user-research.html
index e12fa62..9f29641 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -8,13 +8,17 @@
 
   
   
-{% for child in this.children|sort(attribute='key') %}
+{% for child in 
site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %}
   
 
   
 
   
-{{ _(child.title) 
}}
+{% if child.title == "Become a Tester" %}
+  https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-qa;>{{ 
_(child.title) }}
+{% else %}
+  {{ 
_(child.title) }}
+{% endif %}
   
   {{ _(child.subtitle) }}
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] punctuation and capitalization edits

[pili]

commit 2accd20efbce6167fbbbc8a1d28b30379fb0dd19
Author: Stephanie A. Whited 
Date:   Thu Oct 31 19:16:51 2019 +

punctuation and capitalization edits
---
 content/training/checklist/contents.lr | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/training/checklist/contents.lr 
b/content/training/checklist/contents.lr
index 5712680..601ca09 100644
--- a/content/training/checklist/contents.lr
+++ b/content/training/checklist/contents.lr
@@ -1,28 +1,28 @@
 _model: page
 ---
-title: Training checklist
+title: Training Checklist
 ---
 body:
 
-Use this checklist to run a Tor Training.
+Complete this checklist before running a Tor training.
 
-## Get prepared
+## Prepare
 
-  [  ]  I read and agree with the Tor Project [Code of 
Coduct](https://community.torproject.org/training/code-of-conduct/)
+  [  ] I read and agree with the Tor Project [Code of 
Coduct](https://community.torproject.org/training/code-of-conduct/)
 
-  [  ]  I read the Trainers Guide
+  [  ] I read the Trainers Guide
 
   [  ] I have an agenda for the training
 
   [  ] I reviewed the training slides
 
-## Security protocol
+## Security Protocol
 
   [  ] I already contacted my organization and told them that I'm organizing 
this training
 
   [  ] I shared a contact to whom my organization should call if something 
happens
 
-## About the venue
+## About the Venue
 
   [  ] The venue has enough tables and chairs to everyone
 
@@ -38,7 +38,7 @@ Use this checklist to run a Tor Training.
 
   [  ] I have confirmed participants for the training
 
-## During the training
+## During the Training
 
 Before starting the training, make sure you:
 
@@ -50,7 +50,7 @@ Before starting the training, make sure you:
 
   [  ] "All questions are welcome"
 
-## After the training
+## After the Training
 
   [  ] Collect participants feedback
 
@@ -70,6 +70,6 @@ section: Training
 ---
 section_id: training
 ---
-subtitle: Based on our best practices, we have a training checklist to help you
+subtitle: Based on our best practices, we have a checklist to help you prepare 
to conduct your training.
 ---
 key: 4



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Add Tor personas

[pili]

commit f8b8ff47daa9c82cd02d1f9fc20ddd5503dfd3cd
Author: Antonela 
Date:   Tue Nov 12 19:13:06 2019 +0900

Add Tor personas

close https://dip.torproject.org/torproject/web/community/issues/107
---
 content/user-research/persona/contents.lr | 27 +++
 lego  |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/content/user-research/persona/contents.lr 
b/content/user-research/persona/contents.lr
new file mode 100644
index 000..147cee9
--- /dev/null
+++ b/content/user-research/persona/contents.lr
@@ -0,0 +1,27 @@
+section: user research
+---
+section_id: user-research
+---
+color: primary
+---
+_template: layout.html
+---
+title: Tor Personas
+---
+subtitle: Personas help us to drive ​human-centered design processes across 
teams. Meet our archetypes of Tor users.
+---
+key: 4
+---
+html: two-columns-page.html
+---
+body:
+Persona is a tool that represents the needs, thoughts, and goals of the target 
user. We created personas because they help us to drive ​human-centered 
design processes.
+As part of our global south travels during 2018 and 2019, we got the lucky 
chance to meet a lot of different Tor users: from activists to journalists, all 
of them with different motivations, but demanding a usable private and secure 
tool to access the Internet.
+With the Community Team, we have been working collecting and mapping real user 
stories and finding patterns across them. It is how our Personas emerged from 
our in field research.
+
+### Tor Personas
+* [Jelani, the human rights 
defender](https://dip.torproject.org/torproject/ux/research/tree/master/persona/jelani.pdf)
+* [Aleisha, the privacy 
looker](https://dip.torproject.org/torproject/ux/research/tree/master/persona/aleisha.pdf)
+* [Fernanda, the feminist 
activist](https://dip.torproject.org/torproject/ux/research/tree/master/persona/fernanda.pdf)
+* [Fatima, the censored 
user](https://dip.torproject.org/torproject/ux/research/tree/master/persona/fatima.pdf)
+* [Alex, the fearless 
journalist](https://dip.torproject.org/torproject/ux/research/tree/master/persona/alex.pdf)
diff --git a/lego b/lego
index 6a550fa..09c5813 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 6a550faea39a534af47923a01bd29d138365819f
+Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] We want to link to training resources in the training repo

[pili]

commit 01dc04ef3917ef242f2a3a7626e7dc8d157fabba
Author: Pili Guerra 
Date:   Thu Oct 31 14:36:32 2019 +0100

We want to link to training resources in the training repo
---
 databags/training-resources.json | 11 +++
 templates/resources.html | 21 +
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/databags/training-resources.json b/databags/training-resources.json
new file mode 100644
index 000..b1fecd7
--- /dev/null
+++ b/databags/training-resources.json
@@ -0,0 +1,11 @@
+{
+"all-about-tor" : 
+{
+"label" : "All About Tor",
+"name" : "all-about-tor",
+"filename" : "all-about-tor-full-pack",
+"formats" : ["odp","md"],
+"description" : "Full set of slides for Tor Trainings",
+"date" : "2019"
+}
+}
\ No newline at end of file
diff --git a/templates/resources.html b/templates/resources.html
index d40c313..1ee86d9 100644
--- a/templates/resources.html
+++ b/templates/resources.html
@@ -14,16 +14,21 @@
 
   
   
-{% from "macros/resources.html" import render_resource %}
-{% for item in this.attachments %}
-  {{ render_resource(item) }}
-{% endfor %}
+  {% for id, item in bag('training-resources').items() %}
+
+  {{ item.label}}
+  {{ item.description }}
+  
+{% for format in item.formats %}
+https://gitweb.torproject.org/community/training.git/plain/{{ item.date 
}}/{{ item.name }}/{{ item.filename }}.{{format}}">{{ format }}
+{% endfor %}
+  
+  {{ item.date }}
+
+  {% endfor %}
   
 
   
 
   
-
-
-
-
+
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] grammar, flow, and punctuation edits

[pili]

commit 76f2f7bfbfe4c978aa65dd742633822f016ac800
Author: Stephanie A. Whited 
Date:   Thu Oct 31 19:21:36 2019 +

grammar, flow, and punctuation edits
---
 content/training/faq/contents.lr | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/content/training/faq/contents.lr b/content/training/faq/contents.lr
index 69a2d72..85ed923 100644
--- a/content/training/faq/contents.lr
+++ b/content/training/faq/contents.lr
@@ -4,23 +4,23 @@ title: Tor Training FAQ
 ---
 body:
 
-After running a couple of Tor training, you will find out that first time 
users have some similar questions about Tor.
-Here we aggregate the most frequent questions that we listened during our 
training sessions and you must be aware before running your training.
-For an extensive resource check [Support 
portal](https://support.torproject.org).
+After running a couple of Tor trainings, you will find that first time users 
have some similar questions about Tor.
+These are the most frequent questions we hear during our training sessions. Be 
prepared for them before running your training. 
+For an extensive resource, check [Support 
portal](https://support.torproject.org).
 
  * [Why is it called 
Tor?](https://support.torproject.org/about/why-is-it-called-tor/)
  * [Does using Tor Browser protect other applications on my 
computer?](https://support.torproject.org/tbb/tbb-13/)
- * [Using Tor with a VPN is more 
secure?](https://support.torproject.org/faq/faq-5/)
- * [Can I browse normal HTTPS sites with 
Tor?](https://support.torproject.org/https/https-2/)
+ * [Is using Tor with a VPN more 
secure?](https://support.torproject.org/faq/faq-5/)
+ * [Can I browse HTTPS sites with 
Tor?](https://support.torproject.org/https/https-2/)
  * [Is it possible to find out the path that a client is taking on the Tor 
Network?](https://support.torproject.org/misc/misc-1/)
  * [Why don't you prevent bad people from doing bad things when using 
Tor?](https://support.torproject.org/misc/misc-2/)
  * [When I use Tor Browser, will anyone be able to tell which websites I 
visit?](https://support.torproject.org/tbb/tbb-3/)
  * [Why did my search engine switch to DuckDuckGo? Or what is 
DuckDuckGo?](https://support.torproject.org/tbb/tbb-41/)
  * [What is a bridge?](https://support.torproject.org/censorship/censorship-7/)
  * [Tor Browser won't connect, but it doesn’t seem to be an issue with 
censorship.](https://support.torproject.org/tbb/tbb-20/)
- * [What is the difference between using Tor Browser and 'Incognito mode' or 
private tabs? ](https://support.torproject.org/tbb/tbb-and-incognito-mode/)
+ * [What is the difference between using Tor Browser and 'incognito mode' or 
private tabs? ](https://support.torproject.org/tbb/tbb-and-incognito-mode/)
  * [Does running Tor Browser make me a 
relay?](https://support.torproject.org/tbb/tbb-33/)
- * [Who funds Tor](https://support.torproject.org/misc/misc-3/)
+ * [Who funds Tor?](https://support.torproject.org/misc/misc-3/)
  * [Is there a backdoor in 
Tor?](https://support.torproject.org/about/backdoor/)
 
 ---
@@ -36,4 +36,4 @@ section_id: training
 ---
 subtitle:
 
-You probably should know these answers before teaching about Tor
+People new to Tor often ask similar questions, and we can help you prepare for 
answering them. 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] update lego

[pili]

commit 548d63c3f3ce1b05ccedeed12359834993271f97
Author: hiro 
Date:   Thu Oct 31 13:50:21 2019 +0100

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 08f767b..8a4ddc7 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 08f767bc33c462c2bc3ae8dd05039c6c3c6d7f39
+Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Fix relay post-install link

[pili]

commit 110c22f798f167661ca4b209949349814b7a81be
Author: Gustavo Gus 
Date:   Wed Nov 13 20:22:22 2019 +

Fix relay post-install link
---
 content/relay-operations/technical-setup/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/relay-operations/technical-setup/contents.lr 
b/content/relay-operations/technical-setup/contents.lr
index 6ce43c8..cbd5812 100644
--- a/content/relay-operations/technical-setup/contents.lr
+++ b/content/relay-operations/technical-setup/contents.lr
@@ -40,6 +40,6 @@ If you are looking to run a relay with minimal effort, we 
recommend you stick to
 
 The installation commands are shown in code blocks and must be executed with 
root privileges.
 
-Click below in which type of relay do you want to host and don't forget to 
read [Relay post-install and good 
practices](relays-post-install-and-good-practices).
+Click below in which type of relay do you want to host and don't forget to 
read [Relay post-install and good practices](/relay/setup/post-install/).
 ---
 _slug: {{setup}}



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] change link

[pili]

commit 6fd081a6850881bb99762b582c4625a1df493d04
Author: dgaleanoservian-guest 
Date:   Tue Oct 8 21:28:05 2019 +0200

change link
---
 content/localization/translation-problem/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/localization/translation-problem/contents.lr 
b/content/localization/translation-problem/contents.lr
index 56eb26d..242c109 100644
--- a/content/localization/translation-problem/contents.lr
+++ b/content/localization/translation-problem/contents.lr
@@ -18,7 +18,7 @@ body:
 
 ### Reporting an error with a translation
 
-* If you are already a [Tor translator](becoming-tor-translator), you can 
simply find the string and fix it in 
[transifex](https://www.transifex.com/otf/torproject/).
+* If you are already a [Tor translator](../becoming-tor-translator), you can 
simply find the string and fix it in 
[transifex](https://www.transifex.com/otf/torproject/).
 * If you don't know how to find the string to fix, you can [open a ticket on 
our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), under 
the **Community/Translations** component.
 * You can report such issues on [irc](https://webchat.oftc.net/), on the 
#tor-l10n channel (you may need to be registered to log in).
 * You can send an email to the [tor localization mailing 
list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n).



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] update content

[pili]

commit 6652dc35ef9451ffcccfa45a9f5662bfdde4
Author: Antonela 
Date:   Mon Oct 21 13:40:23 2019 -0300

update content
---
 content/user-research/become-tester/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index 46b41fb..de0ef97 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -4,7 +4,7 @@ section_id: user-research
 ---
 title: Become a Tester
 ---
-subtitle: We regularly release Tor Browser Alpha versions to allow users to 
test software improvements and new ideas. [Sign up to be in our testing 
pool](https://survey.torproject.org/alpha-tester).
+subtitle: We regularly release Tor Browser early versions to allow users to 
test software improvements and new ideas. Sign up to be in our testing pool.
 ---
 key: 1
 ---



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] update content

[pili]

commit 5c8832006c6b2575cbbd17bfc1aa4501f751432e
Author: Antonela 
Date:   Fri Oct 18 13:07:30 2019 -0300

update content
---
 content/user-research/open/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/user-research/open/contents.lr 
b/content/user-research/open/contents.lr
index bfb6a10..c1f5c1a 100644
--- a/content/user-research/open/contents.lr
+++ b/content/user-research/open/contents.lr
@@ -17,7 +17,7 @@ key: 2
 html: two-columns-page.html
 ---
 body:
-These are our current needs for testing Tor products, as well as methodologies 
and testing scripts. Before running Tor user research, be sure you read our 
[Guidelines to becoming a user researcher with Tor](#).
+These are our current needs for testing Tor products, as well as methodologies 
and testing scripts. Before running Tor user research, be sure you read our 
[Guidelines to becoming a user researcher with 
Tor](https://community.torproject.org/user-research/guidelines).
 
 ### Tor Browser for Desktop
 * [User Research: 
Onboarding](https://dip.torproject.org/torproject/ux/research/blob/master/scripts%20and%20activities/2019/4._Tor_Browser_Desktop_-_download__launch__browse.pdf)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] update content status

[pili]

commit 1e624ba4452939bf3b78fdba217e60b51d0d5949
Author: Antonela 
Date:   Mon Oct 21 13:02:33 2019 -0300

update content status
---
 content/user-research/become-tester/contents.lr | 2 +-
 content/user-research/guidelines/contents.lr| 2 +-
 content/user-research/open/contents.lr  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index 46b41fb..9540db2 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -8,6 +8,6 @@ subtitle: We regularly release Tor Browser Alpha versions to 
allow users to test
 ---
 key: 1
 ---
-_hidden: yes
+discoverable: no
 ---
 body:
diff --git a/content/user-research/guidelines/contents.lr 
b/content/user-research/guidelines/contents.lr
index 0958fe9..d6256ca 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -8,7 +8,7 @@ title: User Research Guidelines
 ---
 subtitle: We collect only necessary data to improve our services.
 ---
-_hidden: yes
+_discoverable: yes
 ---
 key: 3
 ---
diff --git a/content/user-research/open/contents.lr 
b/content/user-research/open/contents.lr
index 252fbea..5aacad2 100644
--- a/content/user-research/open/contents.lr
+++ b/content/user-research/open/contents.lr
@@ -12,7 +12,7 @@ title: Open User Research
 ---
 subtitle: We put our users in the center of our development process. That is 
how we bring privacy-enhancing technology to the ones who more need it. Explore 
what we are working on and start to run user research with your local community.
 ---
-_hidden: yes
+_discoverable: yes
 ---
 key: 2
 ---



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [community/develop] Restore lego

[pili]

commit 9ef6d1404feba7ebc0018812a701ebd39302c14d
Author: hiro 
Date:   Tue Nov 12 11:34:33 2019 +0100

Restore lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 09c5813..6a550fa 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790
+Subproject commit 6a550faea39a534af47923a01bd29d138365819f



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits