[tbb-commits] [torbutton/master] fixup! Bug 15852: Remove/synchronize Torbutton SOCKS pref logic