[tor-commits] [compass/master] Merge pull request #1 from cwacek/bug_7924