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

This commit is contained in:
Nick Mathewson 2017-01-11 09:28:54 -05:00
commit 2db858ef61
2 changed files with 6 additions and 1 deletions

5
changes/18146 Normal file
View File

@ -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.

View File

@ -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: