[tor-commits] [torbutton/master] Merge remote-tracking branch 'brade/bug9454'