most recent changes, diff for tor-devel

Could not connect: Can't connect to local MySQL server through socket '/tmp/mysql.sock' (61)