Improve Iceweasel feature.

features/cucumber/iceweasel/step_definitions/torified_browsing.rb

@@ -84,12 +84,9 @@ Given /^I have a network connection$/ do
   wait_until_remote_shell_is_up
 end
 
-Given /^Tor has bootstrapped$/ do
+Given /^Tor has built a circuit$/ do
   next if @background_restored
-  # FIXME: A better approach would be to check this via the control
-  # port with: GETINFO status/circuit-established
-  cmd = 'grep -q "Bootstrapped 100%" /var/log/tor/log'
-  try_for(120, lambda{ @vm.execute(cmd, "root").success? })
+  wait_until_tor_is_working
 end
 
 Given /^Iceweasel has autostarted and is not loading a web page$/ do

features/cucumber/iceweasel/torified_browsing.feature

-Feature: Iceweasel must be anonymous.
-  In order to be anonymous, the iceweasel web browser must connect through Tor.
+Feature: Browsing the web using Iceweasel
+  As a Tails user
+  when I browse the web using Iceweasel
+  all network traffic should flow only through Tor
 
   Background:
     Given I restore the background snapshot if it exists
@@ -7,7 +9,7 @@ Feature: Iceweasel must be anonymous.
     And the network traffic is sniffed
     And I log in to a new session
     And I have a network connection
-    And Tor has bootstrapped
+    And Tor has built a circuit
     And Iceweasel has autostarted and is not loading a web page
     And the time has synced
     And I save the background snapshot if it does not exist