[or-cvs] [tor/master] fix grammar / add changelog for the torify commit

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Sun, 20 Sep 2009 23:24:46 -0400
Subject: fix grammar / add changelog for the torify commit
Commit: ed62b031d3f34bb954fa97470e4602bb5bcad2fe

---
 ChangeLog         |    5 ++++-
 contrib/torify.in |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b25ea06..0b405f8 100644
--- 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 d9aac1d..d430da8 100755
--- 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
-- 
1.5.6.5