Skip to content
Commit f89b0842 authored by Tails developers's avatar Tails developers
Browse files

Merge remote-tracking branch 'origin/testing' into test/7821-tor

Conflicts:
	features/step_definitions/common_steps.rb
	features/step_definitions/torified_misc.rb
	features/support/helpers/misc_helpers.rb
	features/support/helpers/sniffing_helper.rb
	features/support/hooks.rb
parents f877e00a 70afb4af
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment