From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 30 Apr 2018 13:47:35 +0000 (-0400)
Subject: Describe schedules as TimeInterval, not TimeIntervalCommaList.
X-Git-Tag: tor-0.3.4.1-alpha~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b205061eb13abd68a5335f8008c5121ef230c34e;p=thirdparty%2Ftor.git

Describe schedules as TimeInterval, not TimeIntervalCommaList.
---

diff --git a/src/or/config.c b/src/or/config.c
index 9e9c7e58d6..54f3930fc5 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -8105,7 +8105,10 @@ getinfo_helper_config(control_connection_t *conn,
         case CONFIG_TYPE_ISOTIME: type = "Time"; break;
         case CONFIG_TYPE_ROUTERSET: type = "RouterList"; break;
         case CONFIG_TYPE_CSV: type = "CommaList"; break;
-        case CONFIG_TYPE_CSV_INTERVAL: type = "TimeIntervalCommaList"; break;
+        /* This type accepts more inputs than TimeInterval, but it ignores
+         * everything after the first entry, so we may as well pretend
+         * it's a TimeInterval. */
+        case CONFIG_TYPE_CSV_INTERVAL: type = "TimeInterval"; break;
         case CONFIG_TYPE_LINELIST: type = "LineList"; break;
         case CONFIG_TYPE_LINELIST_S: type = "Dependent"; break;
         case CONFIG_TYPE_LINELIST_V: type = "Virtual"; break;