--- vidalia-0.1.7/src/vidalia/log/messagelog.cpp~	2006-10-03 16:35:14.000000000 -0400
+++ vidalia-0.1.7/src/vidalia/log/messagelog.cpp	2006-10-23 11:56:42.000000000 -0400
@@ -51,7 +51,7 @@
 #define DEFAULT_LOGFILE \
   (win32_program_files_folder()+"\\Tor\\tor-log.txt")
 #else
-#define DEFAULT_LOGFILE       (QDir::homePath() + "/.tor/tor-log.txt")
+#define DEFAULT_LOGFILE       ("/var/log/tor/tor.log")
 #endif
 
 #define ADD_TO_FILTER(f,v,b)  (f = ((b) ? ((f) | (v)) : ((f) & ~(v))))
--- vidalia-0.1.7/src/vidalia/config/torsettings.cpp~	2007-08-26 07:53:25.000000000 +0200
+++ vidalia-0.1.7/src/vidalia/config/torsettings.cpp	2007-09-05 19:52:53.000000000 +0200
@@ -78,16 +78,16 @@
   else
     setDefault(SETTING_TOR_EXECUTABLE, programFiles + "\\Tor\\tor.exe");
 #else
-  setDefault(SETTING_TOR_EXECUTABLE, "tor");
+  setDefault(SETTING_TOR_EXECUTABLE, "/usr/bin/tor");
 #endif
 
-  setDefault(SETTING_TORRC,         Vidalia::dataDirectory() + "/torrc");
+  setDefault(SETTING_TORRC,         "/etc/tor/torrc");
   setDefault(SETTING_CONTROL_ADDR,  "127.0.0.1");
   setDefault(SETTING_CONTROL_PORT,  9051);
   setDefault(SETTING_AUTH_METHOD,   toString(DEFAULT_AUTH_METHOD));
-  setDefault(SETTING_TOR_USER,      "");
-  setDefault(SETTING_TOR_GROUP,     "");
-  setDefault(SETTING_DATA_DIRECTORY, "");
+  setDefault(SETTING_TOR_USER,      "toruser");
+  setDefault(SETTING_TOR_GROUP,     "toruser");
+  setDefault(SETTING_DATA_DIRECTORY, "/var/lib/tor");
   setDefault(SETTING_CONTROL_PASSWORD, "");
   setDefault(SETTING_USE_RANDOM_PASSWORD, true);
 }
--- vidalia-0.1.7/src/vidalia/vidalia.cpp~	2007-08-26 07:53:25.000000000 +0200
+++ vidalia-0.1.7/src/vidalia/vidalia.cpp	2007-09-05 19:55:00.000000000 +0200
@@ -330,7 +330,7 @@
   if (_args.contains(ARG_PIDFILE)) {
     return _args.value(ARG_PIDFILE);
   }
-  return QDir::convertSeparators(dataDirectory() + "/vidalia.pid");
+  return QDir::convertSeparators("/var/run/tor/tor.pid");
 }
 
 Log::LogMessage