Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5

2024-12-06 19:41:15 +01:00 · 2014-09-10 22:12:47 -04:00
parent 8eed82b3d4 a3fe8b1166
commit a9b2e5eac6
2 changed files with 11 additions and 0 deletions
@@ -0,0 +1,4 @@
+  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.