Commit 9b162ef4 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

only clear the bridge list if options->Bridges is set. 

this doesn't matter yet so we aren't adding them in other
ways yet.


svn:r12730
parent 6bf8e8ae

src/or/config.c

+2 −5
Original line number Diff line number Diff line
@@ -986,8 +986,8 @@ options_act(or_options_t *old_options) 
      add_default_trusted_dirservers();

  }



  clear_bridge_list();

  if (options->Bridges) {

    clear_bridge_list();

    for (cl = options->Bridges; cl; cl = cl->next) {

      if (parse_bridge_line(cl->value, 0)<0) {

        log_warn(LD_BUG,
@@ -1026,7 +1026,7 @@ options_act(or_options_t *old_options) 


  /* Bail out at this point if we're not going to be a client or server:

   * we want to not fork, and to log stuff to stderr. */

  if (options->command != CMD_RUN_TOR)

  if (!running_tor)

    return 0;



  {
@@ -1079,9 +1079,6 @@ options_act(or_options_t *old_options) 
  if (accounting_is_enabled(options))

    configure_accounting(time(NULL));



  if (!running_tor)

    return 0;



  /* Check for transitions that need action. */

  if (old_options) {

    if (options->UseEntryGuards && !old_options->UseEntryGuards) {