TBB 3.5 doesn't allow multiple socksport lines in torrc because it uses deprecated sockslistenaddress in torrc-defaults

If I manually edit Data/Tor/torrc in TBB3.5 to say

socksport 9150
socksport 9160

then my TBB fails to start Tor, because Tor says

Dec 20 00:49:47.169 [warn] SocksListenAddress can't be used when there are multiple SocksPort lines
Dec 20 00:49:47.169 [warn] Failed to parse/validate config: Invalid SocksPort/SocksListenAddress configuration

The man page says SocksListenAddress is deprecated as of 0.2.3.x-alpha.

I think we should simply remove that sockslistenaddress line from torrc-defaults.