[or-cvs] r8558: touchups (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2006-10-01 00:55:12 -0400 (Sun, 01 Oct 2006)
New Revision: 8558

Modified:
   tor/trunk/src/or/config.c
   tor/trunk/src/or/policies.c
Log:
touchups


Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2006-10-01 00:22:20 UTC (rev 8557)
+++ tor/trunk/src/or/config.c	2006-10-01 04:55:12 UTC (rev 8558)
@@ -2132,7 +2132,7 @@
   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 {

Modified: tor/trunk/src/or/policies.c
===================================================================
--- tor/trunk/src/or/policies.c	2006-10-01 00:22:20 UTC (rev 8557)
+++ tor/trunk/src/or/policies.c	2006-10-01 04:55:12 UTC (rev 8558)
@@ -520,7 +520,7 @@
     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 @@
       }
       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;