3 files changed, 8 insertions, 25 deletions

diff --git a/contrib/client-tools/torify b/contrib/client-tools/torify
index ac4c9b5c7f..94640c0faf 100755
--- a/contrib/client-tools/torify
+++ b/contrib/client-tools/torify
@@ -37,25 +37,8 @@ case $1 in -v|--verbose)
 	shift
 esac
 
-# taken from Debian's Developer's Reference, 6.4
-pathfind() {
-       OLDIFS="$IFS"
-       IFS=:
-       for p in $PATH; do
-               if [ -x "$p/$*" ]; then
-                       IFS="$OLDIFS"
-                       return 0
-               fi
-       done
-       IFS="$OLDIFS"
-       return 1
-}
-
-if pathfind torsocks; then
+if command -v torsocks > /dev/null; then
     exec torsocks "$@"
-    echo "$0: Failed to exec torsocks $*" >&2
-    exit 1
 else
     echo "$0: torsocks not found in your PATH.  Perhaps it isn't installed?  (tsocks is no longer supported, for security reasons.)" >&2
 fi
-
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index 4d6ec37c51..022e383baf 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,13 +8,13 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.7.15-dev"
+!define VERSION "0.4.8.8-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"
 !define BIN "..\bin" ;BIN is where it expects to find tor.exe, tor-resolve.exe
-  
- 
+
+
 SetCompressor /SOLID LZMA ;Tighter compression
 RequestExecutionLevel user ;Updated for Vista compatibility
 OutFile ${INSTALLER}
@@ -29,7 +29,7 @@ VIProductVersion "${VERSION}"
 VIAddVersionKey "ProductName" "The Onion Router: Tor"
 VIAddVersionKey "Comments" "${WEBSITE}"
 VIAddVersionKey "LegalTrademarks" "Three line BSD"
-VIAddVersionKey "LegalCopyright" "©2004-2008, Roger Dingledine, Nick Mathewson. ©2009 The Tor Project, Inc. "
+VIAddVersionKey "LegalCopyright" "©2004-2008, Roger Dingledine, Nick Mathewson. ©2009 The Tor Project, Inc. "
 VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
 VIAddVersionKey "FileVersion" "${VERSION}"
 
@@ -121,7 +121,7 @@ SectionEnd
 
 Section "Desktop" Desktop
    SetOutPath $INSTDIR
-   CreateShortCut "$DESKTOP\Tor.lnk" "$INSTDIR\tor.exe" "" "$INSTDIR\tor.ico" 
+   CreateShortCut "$DESKTOP\Tor.lnk" "$INSTDIR\tor.exe" "" "$INSTDIR\tor.ico"
 SectionEnd
 
 Section /o "Run at startup" Startup
diff --git a/contrib/win32build/tor.nsi.in b/contrib/win32build/tor.nsi.in
index dd24df454c..2d8c2b9adf 100644
--- a/contrib/win32build/tor.nsi.in
+++ b/contrib/win32build/tor.nsi.in
@@ -5,8 +5,8 @@
 ; NOTE: This file might be obsolete. Look at tor-mingw.nsi.in instead.
 ;-----------------------------------------
 ; How to make an installer:
-;   Step 0. If you are a Tor maintainer, make sure that tor.nsi and
-;           src/win32/orconfig.h all have the correct version number.
+;   Step 0. If you are a Tor maintainer, make sure that tor.nsi has
+;           the correct version number.
 ;   Step 1. Download and install OpenSSL.  Make sure that the OpenSSL
 ;           version listed below matches the one you downloaded.
 ;   Step 2. Download and install NSIS (http://nsis.sourceforge.net)