[tor-commits] [torbrowser/maint-2.2] update tbb linux tor to 0.2.2.22-alpha and remove polipo and privoxy check from launch script

[erinn at torproject.org]

commit f0f11640ad1d96a650ddff794727bc00f462b489
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Jan 25 08:22:42 2011 +0100

    update tbb linux tor to 0.2.2.22-alpha and remove polipo and privoxy check from launch script
---
 README.Linux                     |    6 +++++-
 src/RelativeLink/RelativeLink.sh |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.Linux b/README.Linux
index e2774b0..24fb022 100644
--- a/README.Linux
+++ b/README.Linux
@@ -5,7 +5,7 @@ Included applications
 ---------------------
 
 Vidalia 0.2.10 (with Qt 4.6.2)
-Tor 0.2.2.21-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
+Tor 0.2.2.22-alpha (with libevent-1.4.13, zlib-1.2.3 and openssl-0.9.8p) 
 Firefox 3.6.13
  \_ Torbutton 1.2.5
  |_ NoScript 2.0.9.3
@@ -29,6 +29,10 @@ To exit, close Firefox. Vidalia will automatically clean up and exit.
 Changelog
 ---------
 
+1.1.4:  Released 2011-01-27
+        Update Tor to 0.2.2.22-alpha
+        Remove useless polipo and privoxy check from shell script
+
 1.1.3-1: Released 2011-01-18
         32-bit only fix: put actual Tor 0.2.2.21-alpha in the tarball
 
diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh
index e7b7be4..5b83305 100755
--- a/src/RelativeLink/RelativeLink.sh
+++ b/src/RelativeLink/RelativeLink.sh
@@ -44,7 +44,7 @@ export DYLD_PRINT_LIBRARIES
 
 # if any relevant processes are running, inform the user and exit cleanly
 RUNNING=0
-for process in tor vidalia polipo privoxy
+for process in tor vidalia
         do pid=`pidof $process`
         if [ -n "$pid" ]; then
 		printf "\n$process is already running as PID $pid\n\n"