summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-01-11 09:28:54 -0500
committerNick Mathewson <nickm@torproject.org>2017-01-11 09:28:54 -0500
commit2db858ef610ef28875631ee738ec4b3d6fcdca11 (patch)
treea5182db72a46be169b7be924d580d3b8b6decaf3 /src/or/config.c
parent6c2b48dab73f7c4fb0ed79185b9f123dc2349be8 (diff)
parent58172be657fcac81f37e2556bab4c68bacd36c98 (diff)
downloadtor-2db858ef610ef28875631ee738ec4b3d6fcdca11.tar.gz
tor-2db858ef610ef28875631ee738ec4b3d6fcdca11.zip
Merge remote-tracking branch 'jryans/dependant-corrected'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 9785ec11da..d4177878e7 100644
--- a/src/or/config.c
+++ b/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: