This reverts commit f75cf0bd. See:
bug 30639 for the reasoning behind the revert and some work we need to
do in the meantime.

Kathleen Brade authored Apr 10, 2019 and Georg Koppen committed May 03, 2019

When operating as a client and there is no network activity for
24 hours, tor 0.4.x will enter a dormant mode. Since most people
who start Tor Browser expect to use it right way, and since
bootstrapping won't occur when tor is dormant, we added the following
to torrc-defaults to ensure that tor leaves dormant mode:
  DormantCanceledByStartup 1

Kathleen Brade authored Jan 31, 2017 and boklm committed May 12, 2017

Remove the SocksPort and ControlPort configuration from
torrc-defaults. Tor Launcher configures the ports via args
when starting tor, and we must avoid conflicts.

Also, strengthen the warning to users about not editing
torrc-defaults.