[tor-commits] [pyonionoo/master] Merge remote-tracking branch 'gsathya/bug_6954'