diff -aur tor-0.2.0.35/src/config/torrc.sample.in fw_tor-0.2.0.35/src/config/torrc.sample.in
--- tor-0.2.0.35/src/config/torrc.sample.in	2009-06-24 22:58:02.000000000 +0200
+++ fw_tor-0.2.0.35/src/config/torrc.sample.in	2009-06-29 14:26:54.000000000 +0200
@@ -12,6 +12,8 @@
 ## Tor will look for this file in various places based on your platform:
 ## http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#torrc
 
+## PID file
+PIDFile /var/run/tor.pid
 
 ## Replace this with "SocksPort 0" if you plan to run Tor only as a
 ## server, and not make any local application connections yourself.
@@ -33,9 +35,9 @@
 ## may provide sensitive information to an attacker who obtains the logs.
 ##
 ## Send all messages of level 'notice' or higher to @LOCALSTATEDIR@/log/tor/notices.log
-#Log notice file @LOCALSTATEDIR@/log/tor/notices.log
+Log notice file @LOCALSTATEDIR@/log/tor/tor.log
 ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
-#Log debug file @LOCALSTATEDIR@/log/tor/debug.log
+Log debug file @LOCALSTATEDIR@/log/tor/debug.log
 ## Use the system log instead of Tor's logfiles
 #Log notice syslog
 ## To send all messages to stderr:
@@ -48,7 +50,7 @@
 
 ## The directory for keeping all the keys/etc. By default, we store
 ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-#DataDirectory @LOCALSTATEDIR@/lib/tor
+DataDirectory @LOCALSTATEDIR@/lib/tor/data
 
 ## The port on which Tor will listen for local connections from Tor
 ## controller applications, as documented in control-spec.txt.
Only in fw_tor-0.2.0.35/src/config: torrc.sample.in.orig