Merge remote-tracking branch 'public/bug7816_023'

This commit is contained in:
Nick Mathewson
2013-02-11 16:14:17 -05:00
+4 -1
View File
@@ -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);