Merge branch 'bug2474'

Had to resolve conflicts wrt the " (using bufferevents)" addition to the startup string. Conflicts: src/or/main.c
2024-12-06 19:41:15 +01:00 · 2011-11-23 17:14:54 -05:00
parent 3890c81e7c 2b4d4ffa8f
commit f067067ee6
2 changed files with 20 additions and 5 deletions
@@ -0,0 +1,5 @@
+  o Minor features
+    - Try to make the introductory warning message that Tor prints on
+      startup more useful for actually finding help and information.
+      Resolves bug2474.
+