[tbb-commits] [torbutton/master] Merge remote-tracking branch 'yawning/bug8725_take3'