Merge branch 'maint-0.2.5' into maint-0.2.6

[tor.git] / changes / feature15006

  o Minor features (controller):
    - Messages about problems in the bootstrap process now include
      information about the server we were trying to connect to when we
      noticed the problem. Closes ticket 15006.