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

changes/bug10124

@@ -0,0 +1,3 @@
+  o Documentation:
+    - Replace remaining references to DirServer in man page and
+      log entries. Resolves ticket 10124.