From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 28 Aug 2019 13:46:59 +0000 (-0400)
Subject: Merge branch 'ticket31240v2' into ticket31240v2_merged_2
X-Git-Tag: tor-0.4.2.1-alpha~43^2~2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1d7ddfb02cdbd23fce0c30d6ab4897ede18e7fe;p=thirdparty%2Ftor.git

Merge branch 'ticket31240v2' into ticket31240v2_merged_2
---

b1d7ddfb02cdbd23fce0c30d6ab4897ede18e7fe
diff --cc src/app/config/config.c
index 740315f3e4,66047aeabc..0cbc223d02
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@@ -8133,11 -8125,10 +8125,10 @@@ getinfo_helper_config(control_connectio
    (void) errmsg;
    if (!strcmp(question, "config/names")) {
      smartlist_t *sl = smartlist_new();
-     int i;
-     for (i = 0; option_vars_[i].member.name; ++i) {
-       const config_var_t *var = &option_vars_[i];
+     smartlist_t *vars = config_mgr_list_vars(get_options_mgr());
+     SMARTLIST_FOREACH_BEGIN(vars, const config_var_t *, var) {
 -      /* don't tell controller about triple-underscore options */
 -      if (var->flags & CVFLAG_INVISIBLE)
 +      /* don't tell controller about invisible options */
 +      if (config_var_is_invisible(var))
          continue;
        const char *type = struct_var_get_typename(&var->member);
        if (!type)
diff --cc src/app/config/confparse.c
index 6e2624466a,e0615ac13d..f20a361ba3
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@@ -651,13 -1073,13 +1083,13 @@@ config_dump(const config_mgr_t *mgr, co
        continue;
      }
      /* Don't save 'hidden' control variables. */
-     if (! config_var_is_dumpable(&fmt->vars[i]))
 -    if (mv->cvar->flags & CVFLAG_NODUMP)
++    if (! config_var_is_dumpable(mv->cvar))
        continue;
-     if (minimal && config_is_same(fmt, options, defaults,
-                                   fmt->vars[i].member.name))
+     const char *name = mv->cvar->member.name;
+     if (minimal && config_is_same(mgr, options, defaults, name))
        continue;
      else if (comment_defaults &&
-              config_is_same(fmt, options, defaults, fmt->vars[i].member.name))
+              config_is_same(mgr, options, defaults, name))
        comment_option = 1;
  
      line = assigned =