diff options
authorintrigeri <>2017-03-15 06:48:50 +0000
committerintrigeri <>2017-03-15 06:48:50 +0000
commita1fd92f798fd2e9f8f85421352f0b1af4dfb6740 (patch)
parentbfa5d08a90fd73e46981512845ba9e83f31b0691 (diff)
parent9c1809bdacdf6ba0b17a34ec023cdfa38126ffe4 (diff)
Merge branch 'stable' into devel
13 files changed, 103 insertions, 34 deletions
diff --git a/Rakefile b/Rakefile
index 4aafab6..390d3b2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -31,7 +31,7 @@ VAGRANT_PATH = File.expand_path('../vagrant', __FILE__)
STABLE_BRANCH_NAMES = ['stable', 'testing']
# Environment variables that will be exported to the build script
# Let's save the http_proxy set before playing with it
diff --git a/features/support/helpers/firewall_helper.rb b/features/support/helpers/firewall_helper.rb
index 49e9853..25029a2 100644
--- a/features/support/helpers/firewall_helper.rb
+++ b/features/support/helpers/firewall_helper.rb
@@ -1,5 +1,10 @@
require 'packetfu'
+def looks_like_dhcp_packet?(protocol, sport, dport, ip_packet)
+ protocol == "udp" && sport == 68 && dport == 67 && ip_packet &&
+ ip_packet.ip_saddr == '' && ip_packet.ip_daddr == ""
# Returns the unique edges (based on protocol, source/destination
# address/port) in the graph of all network flows.
def pcap_connections_helper(pcap_file, opts = {})
@@ -37,13 +42,8 @@ def pcap_connections_helper(pcap_file, opts = {})
raise "Found something that cannot be parsed"
- if protocol == "udp" and
- sport == 68 and
- dport == 67 and
- ip_packet.ip_saddr == '' and
- ip_packet.ip_daddr == ""
- next if opts[:ignore_dhcp]
- end
+ next if looks_like_dhcp_packet?(protocol, sport, dport, ip_packet) &&
+ opts[:ignore_dhcp]
packet_info = {
mac_saddr: eth_packet.eth_saddr,
@@ -53,7 +53,7 @@ def pcap_connections_helper(pcap_file, opts = {})
dport: dport,
# It seems *Packet.parse can return nil despite *Packet.can_parse?
- # returning true.
+ # returning true. (#11508)
if ip_packet
packet_info[:saddr] = ip_packet.ip_saddr
packet_info[:daddr] = ip_packet.ip_daddr
diff --git a/wiki/src/blueprint/RT_for_help_desk.mdwn b/wiki/src/blueprint/RT_for_help_desk.mdwn
index 92bdbb6..9798951 100644
--- a/wiki/src/blueprint/RT_for_help_desk.mdwn
+++ b/wiki/src/blueprint/RT_for_help_desk.mdwn
@@ -61,5 +61,8 @@ Options
### RT
+ -
+ - AccessNow have a RT behind their help desk. It's run by Gustaf
+ Björksten <>.
diff --git a/wiki/src/blueprint/Social_Contract.mdwn b/wiki/src/blueprint/Social_Contract.mdwn
index d33f122..3988942 100644
--- a/wiki/src/blueprint/Social_Contract.mdwn
+++ b/wiki/src/blueprint/Social_Contract.mdwn
@@ -4,7 +4,7 @@ Issue number: [[!tails_ticket 11669]]
## Introduction
-The Tails Social Contract is a set of commitments that we as contributors to the Tails project stand by. This work is derived from the Debian Social Contract and Tor Project's Social Contract. If you have any questions or comments, feel free to email: <>.
+The Tails Social Contract is a set of commitments that we as contributors to the Tails project stand by. This work is derived from the Debian Social Contract and the Tor Social Contract. If you have any questions or comments, feel free to email: <>.
This is a promise from our developer community to the rest of the world, affirming a commitment to our beliefs.
@@ -34,6 +34,8 @@ Bugfixes, code improvements, Debian packaging, as well as work on usability issu
We want to produce Tails in a way that encourages participation, which requires publicly documenting what can be improved.
As Tails is created in such a transparent manner, anyone is encouraged to participate, review it and point out problems.
+To make our community a welcoming place for everybody we agreed on a [[Code of Conduct|contribute/working_together/code_of_conduct]].
## 5. We will never harm our users intentionally.
We will always do our best to create secure and usable tools. We will never willingly include backdoors or malicious software nor will we cooperate with any entity wanting us to harm our users.
diff --git a/wiki/src/blueprint/backups.mdwn b/wiki/src/blueprint/backups.mdwn
index d6a004b..84160d1 100644
--- a/wiki/src/blueprint/backups.mdwn
+++ b/wiki/src/blueprint/backups.mdwn
@@ -269,6 +269,13 @@ Other solutions
GNOME frontend. It does snapshots with hardlinks to reduce space.
Can do local and SSH as remote.
+[SpiderOak]( is a commercial online encrypted
+backup service. Reading their website might be useful for the user
+research part of this project.
User experience
diff --git a/wiki/src/blueprint/intercept_interviews.mdwn b/wiki/src/blueprint/intercept_interviews.mdwn
index a2d088a..bc7526f 100644
--- a/wiki/src/blueprint/intercept_interviews.mdwn
+++ b/wiki/src/blueprint/intercept_interviews.mdwn
@@ -19,7 +19,7 @@ Interview script
- Introduction
- Who I am, what I am doing, and why I'm conducting the interview.
- - You can answer our questions to the extend that you feel comfortable
+ - You can answer my questions to the extend that you feel comfortable
and stop at any moment.
- We want to keep this information publicly available for contributors
of the project but in generic terms, removing personally
@@ -46,11 +46,11 @@ Interview script
Template email for validating the output
-> Thank you so much for taking some time to answer our questions about
+> Thank you so much for taking some time to answer my questions about
> Tails the other day!
> I'm sending you here what I plan to store in our public working
-> documents on our website. Feel free to correct me if I misunderstood
+> documents on our website. Please correct me if I misunderstood
> something or if you want me to remove some bits.
Jeanne, February 2017
diff --git a/wiki/src/blueprint/l10n_Portuguese.mdwn b/wiki/src/blueprint/l10n_Portuguese.mdwn
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/wiki/src/blueprint/l10n_Portuguese.mdwn
diff --git a/wiki/src/blueprint/l10n_Spanish.mdwn b/wiki/src/blueprint/l10n_Spanish.mdwn
index 2b77d9e..1fe284a 100644
--- a/wiki/src/blueprint/l10n_Spanish.mdwn
+++ b/wiki/src/blueprint/l10n_Spanish.mdwn
@@ -1,32 +1,42 @@
Documentación de los traductores al español de Tails
+[[!toc levels=2]]
+Si quiero traducir al español cómo puedo empezar
-Ahora mismo tenemos un repo especial, en el que hemos generado los archivos de traducción en algunos idiomas que se ha dicho de comenzar a traducir pero que todavía no son parte de Tails.
-Se puede clonar más nuevo en
-o si no en
+1. Suscribirte a la lista de correos: Tenemos la lista de todos los traductores de Tails a todos los idiomas, y la de traducción al español:
+ - <>
+ - <'spanish>
+2. Puedes traducir con git (un poco más complicado), o hacer una cuenta en la plataforma de traduccion en pruebas (Ver abajo)
-Plataforma en pruebas
+Plataforma de traducción
Estamos testeando una plataforma de traducción del website con weblate, una aplicación web de traducción:
+- El correo o nombre que decidas usar se publicará en el repo.
+- Al hacerte una cuenta edita tu perfil:
+ - El idioma al que quieres traducir
+ - Suscribete al Proyecto Tails en Subscriptions.
+- Lo más importante es traducir las 'core pages'. Estan en <>
+- Para ver el estado de la traducción al castellano:
+ <>
+- Puedes ir sugiriendo traducciones y otras personas tienen que votar o validar la traducción.
+Traducir con git
+Ahora mismo tenemos un repo especial, en el que hemos generado los archivos de traducción en algunos idiomas que se ha dicho de comenzar a traducir pero que todavía no son parte de Tails.
-Al hacerte una cuenta edita tu perfil, especialmente el idioma al que quieres traducir, y suscribete al Proyecto Tails en Subscriptions.
+Se puede clonar con:
-Lo más importante es traducir las 'core pages'. En [translate] estan en <>
+ git clone
-Para ver el estado de la traducción al castellano:
+Se pueden seguir las instrucciones de
diff --git a/wiki/src/blueprint/personas.mdwn b/wiki/src/blueprint/personas.mdwn
index 4b77a3b..bd6dfc1 100644
--- a/wiki/src/blueprint/personas.mdwn
+++ b/wiki/src/blueprint/personas.mdwn
@@ -11,6 +11,26 @@ This is about [[!tails_ticket 11162]].
- [Gus Andrew's User Personas for Privacy and Security](
- [Personas on](
+# Data sources
+- [*Rick Wash & Emilee Rader*, Too Much Knowledge? Security Beliefs and
+ Protective Behaviors Among United States Internet
+ Users]( studies a
+ large representative sample of United States Internet users about
+ different causal beliefs related to computer security, and about the
+ actions they regularly undertake to protect their computers.
+- [*Javier Garza Ramos*, Journalist Security in the Digital
+ World](
+ is a survey of 154 journalists worldwide on their digital security
+ practices.
+- [Jennifer R. Henrichsen]( is
+ doing a research with journalists and digital security trainers to
+ shed light on journalists' perceptions toward digital security
+ technologies, including motivations to adopt and barriers to adoption.
+ In March 2017, the results of her research were not published yet.
# User scenarios
From a discussion in August 2016:
diff --git a/wiki/src/blueprint/survey_platform.mdwn b/wiki/src/blueprint/survey_platform.mdwn
index 760006c..39a4fee 100644
--- a/wiki/src/blueprint/survey_platform.mdwn
+++ b/wiki/src/blueprint/survey_platform.mdwn
@@ -7,6 +7,14 @@ Requirements
- Be possible to integrate in ikiwiki (to avoid people having to go elsewhere to answer questions)
+- Captchas: How do we prevent spam on the survey platform, both from
+ robots and humans.
+ - Captcha can deal with robots.
+ - Attention check questions can deal with humans.
+ - How can we get both without being annoying? Maybe having no captcha
+ and two attention check questions could be useful but then that's
+ maybe a bit annoying for humans.
diff --git a/wiki/src/blueprint/translation_platform.mdwn b/wiki/src/blueprint/translation_platform.mdwn
index 190dba8..c7dff7f 100644
--- a/wiki/src/blueprint/translation_platform.mdwn
+++ b/wiki/src/blueprint/translation_platform.mdwn
@@ -7,10 +7,6 @@ Furthermore, the current process makes it hard to add new languages, as often a
Corresponding ticket: [[!tails_ticket 9049]]
-* We are currently setting up a weblate install, read
- [[!tails_ticket 11759]] for more information.
@@ -60,4 +56,16 @@ MAY
Weblate setup
+We are testing a [weblate instance]( to see if it fits our requirements. Read [[!tails_ticket 11759]] for more information.
+What we plan to do is:
[Schematics of the different Git repos, ikiwiki instances, and their relationships.](
+Currently the repo is following Tails master repo, but the changes it generates are not fed back onto Tails master.
+You can check out weblate-generated Tails repo with:
+ git clone
diff --git a/wiki/src/blueprint/truecrypt_in_gnome_disks.mdwn b/wiki/src/blueprint/truecrypt_in_gnome_disks.mdwn
index b60840d..451ecfc 100644
--- a/wiki/src/blueprint/truecrypt_in_gnome_disks.mdwn
+++ b/wiki/src/blueprint/truecrypt_in_gnome_disks.mdwn
@@ -34,3 +34,13 @@
to focus on getting support for non-nested volumes
only... especially if actual Tails+TC users do not use this
feature, so we shouldn't spend time on it any way.)
+User research
+- Check what security guides are recommending:
+ - Talking to Security-in-a-Box we should focus on file containers and
+ hidden volumes in file containers. Because people are using other
+ tools for disk encryption and file containers also limit a bit the
+ amount of access that other operating systems have to the files
+ (avoids to have the partition full of viruses).
diff --git a/wiki/src/contribute/working_together/code_of_conduct.mdwn b/wiki/src/contribute/working_together/code_of_conduct.mdwn
index 054e346..eee53d2 100644
--- a/wiki/src/contribute/working_together/code_of_conduct.mdwn
+++ b/wiki/src/contribute/working_together/code_of_conduct.mdwn
@@ -3,7 +3,8 @@
Like the technical community as a whole, the Tails team and community
is made up of a mixture of people from all over the world, working on
every aspect of the mission &mdash; including mentorship, teaching, and
-connecting people.
+connecting people. <!-- The commitments that we stand by as a community
+are described in the [[Tails Social Contract|XXX-Fix-this-link]]. -->
Diversity is one of our huge strengths, but it can also lead to
communication issues and unhappiness. To that end, we have a few