Add SocksPort and ControlPort options to the torrc file
Add SocksPort and ControlPort options to the torrc file

Since bug 20761, the SocksPort and ControlPort options have been removed
from the default torrc file, so we need to add them.

boklm/tbb-testsuite,boklm/tbb-testsuite,boklm/tbb-testsuite,boklm/tbb-testsuite,boklm/tbb-testsuite