[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug7816_023'

[nickm at torproject.org]

commit 5f29bc71b37a83e6d583864ad9b7cd97f513e24a
Merge: fd8ef8d afca9ab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 11 16:14:17 2013 -0500

    Merge remote-tracking branch 'public/bug7816_023'

 src/or/config.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --cc src/or/config.c
index 0f8441b,16eadf9..7ca20e4
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -601,14 -773,16 +601,17 @@@ set_options(or_options_t *new_val, cha
            var->type == CONFIG_TYPE_OBSOLETE) {
          continue;
        }
 -      if (!option_is_same(&options_format, new_val, old_options, var_name)) {
 -        line = get_assigned_option(&options_format, new_val, var_name, 1);
 +      if (!config_is_same(&options_format, new_val, old_options, var_name)) {
 +        line = config_get_assigned_option(&options_format, new_val,
 +                                          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);