Commit 5f29bc71 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'public/bug7816_023'

parents fd8ef8dc afca9ab1
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -606,9 +606,12 @@ set_options(or_options_t *new_val, char **msg)
                                          var_name, 1);

        if (line) {
          for (; line; line = line->next) {
          config_line_t *next;
          for (; line; line = next) {
            next = line->next;
            smartlist_add(elements, line->key);
            smartlist_add(elements, line->value);
            tor_free(line);
          }
        } else {
          smartlist_add(elements, (char*)options_format.vars[i].name);