Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged

[tor.git] / changes / ticket32245

  o Code simplification and refactoring:
    - Disable relay_sys when the relay module is disabled.
      Closes ticket 32245.