Merge remote-tracking branch 'origin/maint-0.2.6'

This commit is contained in:
Nick Mathewson
2015-03-09 13:08:20 -04:00
2 changed files with 15 additions and 4 deletions
+4
View File
@@ -0,0 +1,4 @@
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.