sajolida authored Mar 15, 2019 and intrigeri committed May 17, 2019

In other places we introduce the tool before giving it's icon as
context.

Merge branch 'bugfix/13438-parts-of-greeter-translation-not-applied' into stable (Fix-committed: #13438)

Merge remote-tracking branch 'origin/test/16701-more-robust-and-realistic-stream-isolation' into stable

Fix-committed: #16701

Merge remote-tracking branch 'origin/stable' into test/16701-more-robust-and-realistic-stream-isolation

The "Torified session" terminology is not wide-spread and its meaning
is not super obvious. Let's instead use "Tor streams", which matches
Tor's own terminology and the name of this very Cucumber feature.

Test suite: make tails-security-check's SOCKS port test work when there's a live security advisory (refs: #16701)

With a live security advisory, an instance of tails-security-check is already
running, which breaks "I re-run tails-security-check" (timeout waiting for the
process to exit). Let's instead re-run it via its systemd service, so that:

1. any already running tails-security-check is killed, which fixes this bug;

2. we test tails-security-check in an environment closer to how it's run in
   a real Tails: as we can see on #16603, running this kind of scripts via
   systemd or without it can yield subtly different behavior.

But systemctl returns as soon as the process is started, while our
previous implementation waited for tails-security-check to exit.
So we need to wait a little bit before analysing the network trace.