[tor-commits] [torbrowser/maint-2.3] Combine no-polipo-4.0.js and windows-4.0.js into prefs.js