Merge remote-tracking branch 'origin/devel' into test/wip-improved-snapshots
Conflicts: features/step_definitions/common_steps.rb features/step_definitions/firewall_leaks.rb features/step_definitions/pidgin.rb features/step_definitions/time_syncing.rb features/step_definitions/torified_gnupg.rb features/step_definitions/torified_misc.rb features/time_syncing.feature features/torified_browsing.feature Includes s/@vm/$vm/ fixes, removal of "next if @skip_..." lines and adaptations of new scenarios to use the appropriate snapshots.
File moved
This diff is collapsed.
This diff is collapsed.
2.91 KB
852 Bytes
2.24 KB
2.22 KB

| W: | H:
| W: | H:


1.58 KB
2.01 KB
593 Bytes