Merge remote-tracking branch 'jryans/dependant-corrected'

changes/18146

@@ -0,0 +1,5 @@
+  o Minor bugfix (control protocol):
+    - The reply to a "GETINFO config/names" request via the control protocol
+      now spells the type "Dependent" correctly.  This is a breaking change in
+      the control protocol.  (It seems to be ignored by the most common known
+      clients.)  Fixes bug 18146; bugfix on 0.1.1.4-alpha.

src/or/config.c

@@ -7858,7 +7858,7 @@ getinfo_helper_config(control_connection_t *conn,
         case CONFIG_TYPE_CSV: type = "CommaList"; break;
         case CONFIG_TYPE_CSV_INTERVAL: type = "TimeIntervalCommaList"; break;
         case CONFIG_TYPE_LINELIST: type = "LineList"; break;
-        case CONFIG_TYPE_LINELIST_S: type = "Dependant"; break;
+        case CONFIG_TYPE_LINELIST_S: type = "Dependent"; break;
         case CONFIG_TYPE_LINELIST_V: type = "Virtual"; break;
         default:
         case CONFIG_TYPE_OBSOLETE: