From: Roger Dingledine Date: Mon, 21 Sep 2009 03:24:46 +0000 (-0400) Subject: fix grammar / add changelog for the torify commit X-Git-Tag: tor-0.2.2.2-alpha~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed62b031d3f34bb954fa97470e4602bb5bcad2fe;p=thirdparty%2Ftor.git fix grammar / add changelog for the torify commit --- diff --git a/ChangeLog b/ChangeLog index b25ea06dde..0b405f849d 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 d9aac1d66e..d430da8ce7 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