ticket30935 311 B

123456
  1. o Code simplification and refactoring:
  2. - Numerous simplifications in configuration-handling logic:
  3. remove duplicated macro definitions, replace magical names
  4. with flags, and refactor "TestingTorNetwork" to use the
  5. same default-option logic as the rest of Tor.
  6. Closes ticket 30935.