Merge branch 'maint-0.2.5' into maint-0.2.6

[tor.git] / changes / ticket15176

  o Code simplification and refactoring:
    - Refactor main loop to extract the 'loop' part.  This makes it easier
      to run Tor under Shadow. Closes ticket 15176.