actual fix to not run tor tests...no late night coding in multiple checkouts
merged updates