[tor-commits] [compass/master] Merge remote-tracking branch 'gsathya/bug_6691'