diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-09-20 23:24:46 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-09-20 23:24:46 -0400 |
| commit | ed62b031d3f34bb954fa97470e4602bb5bcad2fe (patch) | |
| tree | 7360a7d3db84fd1f22012dce7c1005e41d5a4e00 | |
| parent | 772ce9d085ff5ce36b8d23e1a883e036fd96b830 (diff) | |
| download | tor-ed62b031d3f34bb954fa97470e4602bb5bcad2fe.tar.gz tor-ed62b031d3f34bb954fa97470e4602bb5bcad2fe.zip | |
fix grammar / add changelog for the torify commit
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | contrib/torify.in | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -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 |