• anonym's avatar
    Merge remote-tracking branch 'origin/devel' into feature/jessie · b7b2a9a7
    anonym authored
    Conflicts:
    	config/chroot_local-includes/usr/local/bin/tor-browser
    	config/chroot_local-includes/usr/local/sbin/tails-spoof-mac
    	config/chroot_local-includes/usr/local/sbin/tails-unblock-network
    	features/checks.feature
    	features/domains/default.xml
    	features/images/USBCloneAndInstall.png
    	features/images/USBCloneAndUpgrade.png
    	features/images/USBUpgradeFromISO.png
    	features/step_definitions/apt.rb
    	features/step_definitions/checks.rb
    	features/step_definitions/common_steps.rb
    	features/step_definitions/erase_memory.rb
    	features/step_definitions/firewall_leaks.rb
    	features/step_definitions/tor.rb
    	features/step_definitions/usb.rb
    	features/support/helpers/misc_helpers.rb
    	wiki/src/contribute/design.mdwn
    
    Notes:
    
    * The feature-9672-rework-installer-wording-on-wheezy (of #9572) APT
      overlay was removed, as was the corresponding automated tests suite
      images.
    
    * We now also use masking of the NetworkManager services in
      tails-spoof-mac and tails-unblock-network for disabling them.
    b7b2a9a7
tails-restricted-network-detector 2.53 KB