[tor-commits] [torbutton/master] Merge remote-tracking branch 'acat/30577+2'