[tbb-commits] [tor-browser-bundle/maint-3.6] Revert "Back out Torbutton 1.6.12.3"