          $test->{start_time} = time;
          $test->{pre}->($tbbinfos, $test) if $test->{pre};
          $test_types->{$test->{type}}->($tbbinfos, $test)
-diff --git TBBTestSuite/Tests/TorBootstrap.pm TBBTestSuite/Tests/TorBootstrap.pm
+diff --git a/TBBTestSuite/Tests/TorBootstrap.pm b/TBBTestSuite/Tests/TorBootstrap.pm
 index df9438b..2cc6b10 100644
---- TBBTestSuite/Tests/TorBootstrap.pm
-+++ TBBTestSuite/Tests/TorBootstrap.pm
+--- a/TBBTestSuite/Tests/TorBootstrap.pm
++++ b/TBBTestSuite/Tests/TorBootstrap.pm
 @@ -147,7 +147,7 @@ sub start_tor {
  
  sub stop_tor {

     kill 15, $tbbinfos->{torpid};
     my ($kid, $i) = (0, 5);
     while ($kid == 0 && $i) {

From 047a359f3d9d84e81ffcf9aee233f64ee37f15f3 Mon Sep 17 00:00:00 2001
From: Gunes Acar <gunes.acar@esat.kuleuven.be>
Date: Wed, 20 Aug 2014 22:43:28 -0700
Subject: [PATCH] Remove "always" option. Check Tor process id before trying
 to stop it.

---
 TBBTestSuite/BrowserBundleTests.pm |    1 -
 TBBTestSuite/Tests.pm              |    9 ++++-----
 TBBTestSuite/Tests/TorBootstrap.pm |    2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/TBBTestSuite/BrowserBundleTests.pm b/TBBTestSuite/BrowserBundleTests.pm
index 24dcd6e..bb8962b 100644
--- a/TBBTestSuite/BrowserBundleTests.pm
+++ b/TBBTestSuite/BrowserBundleTests.pm
@@ -156,7 +156,6 @@ our @tests = (
         type   => 'tor_bootstrap',
         descr  => 'Check that we can bootstrap tor',
