Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

[tor.git] / changes / bug12908

  o Minor features:
    - Warn about attempts to run hidden services and relays in the
      same process: that's probably not a good idea. Closes ticket
      12908.