Commit 96a4cb1d authored by Roger Dingledine's avatar Roger Dingledine
Browse files

touchups 


svn:r8558
parent 61030772

src/or/config.c

+1 −1
Original line number Diff line number Diff line
@@ -2132,7 +2132,7 @@ options_validate(or_options_t *old_options, or_options_t *options, 
  if (options->Nickname == NULL) {

    if (server_mode(options)) {

      if (!(options->Nickname = get_default_nickname())) {

        log_notice(LD_CONFIG, "Couldn't pick a nickname hostname based on "

        log_notice(LD_CONFIG, "Couldn't pick a nickname based on "

                   "our hostname; using %s instead.", UNNAMED_ROUTER_NICKNAME);

        options->Nickname = tor_strdup(UNNAMED_ROUTER_NICKNAME);

      } else {

src/or/policies.c

+3 −3
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ exit_policy_remove_redundancies(addr_policy_t **dest) 
    tmp=ap;

    while (tmp) {

      if (tmp->next && addr_policy_covers(ap, tmp->next)) {

        log(LOG_INFO, LD_CONFIG, "Removing exit policy %s.  It is made "

        log(LOG_DEBUG, LD_CONFIG, "Removing exit policy %s.  It is made "

            "redundant by %s.", tmp->next->string, ap->string);

        victim = tmp->next;

        tmp->next = victim->next;
@@ -550,8 +550,8 @@ exit_policy_remove_redundancies(addr_policy_t **dest) 
      }

      if (ap->policy_type == tmp->policy_type &&

          addr_policy_covers(tmp, ap)) {

        log(LOG_INFO, LD_CONFIG, "Removing exit policy %s.  It is made "

            "redundant by %s.", ap->string, tmp->string);

        log(LOG_DEBUG, LD_CONFIG, "Removing exit policy %s.  It is already "

            "covered by %s.", ap->string, tmp->string);

        victim = ap;

        ap = ap->next;