fix grammar / add changelog for the torify commit

diff --git a/ChangeLog b/ChangeLog
index b25ea06dde7665a311f8f4c7f6e0cd7d50800a08..0b405f849d0fd8aadfedf9b6c03a9192706253ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.2.2-alpha - 2009-09-18
+Changes in version 0.2.2.2-alpha - 2009-09-2?
   o Major features:
     - Tor now tracks how long it takes to build client-side circuits
       over time, and adapts its timeout to local network performance.
@@ -56,6 +56,9 @@ Changes in version 0.2.2.2-alpha - 2009-09-18
     - Work around a small memory leak in some versions of OpenSSL that
       stopped the memory used by the hostname TLS extension from being
       freed.
+    - Make our 'torify' script more portable; if we have only one of
+      'torsocks' or 'tsocks' installed, don't complain to the user;
+      and explain our warning about tsocks better.
 
   o Minor features:
     - Add a "getinfo status/accepted-server-descriptor" controller

diff --git a/contrib/torify.in b/contrib/torify.in
index d9aac1d66ef26954d7df0562c571f8b3ffa4f441..d430da8ce7454b7bd4d8ff5cbb0c8cc58767e81a 100755 (executable)
--- a/contrib/torify.in
+++ b/contrib/torify.in
@@ -66,6 +66,6 @@ elif pathfind tsocks; then
        fi
 
 else
-       echo "$0: Can't find neither tsocks nor torsocks in your PATH. Perhaps you haven't installed either?" >&2
+       echo "$0: Can't find either tsocks or torsocks in your PATH. Perhaps you haven't installed either?" >&2
        exit 1
 fi