[tbb-commits] [tor-browser-bundle/master] Rebased Yawning's patch to fix build bustage.