Merge remote-tracking branch 'teor/bug18351'

1 files changed, 9 insertions, 5 deletions

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 7ec84f038a..31da561291 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1560,20 +1560,24 @@ router_picked_poor_directory_log(const routerstatus_t *rs)
   /* We couldn't find a node, or the one we have doesn't fit our preferences.
    * This might be a bug. */
   if (!rs) {
-    log_warn(LD_BUG, "Firewall denied all OR and Dir addresses for all relays "
-             "when searching for a directory.");
-    log_backtrace(LOG_WARN, LD_BUG, "Node search initiated by");
+    static int logged_backtrace = 0;
+    log_info(LD_BUG, "Wanted to make an outgoing directory connection, but "
+             "all OR and Dir addresses for all relays were not reachable. "
+             "Check ReachableAddresses, ClientUseIPv4, and similar options.");
+    if (!logged_backtrace) {
+      log_backtrace(LOG_INFO, LD_BUG, "Node search initiated by");
+      logged_backtrace = 1;
+    }
   } else if (!fascist_firewall_allows_rs(rs, FIREWALL_OR_CONNECTION, 1)
              && !fascist_firewall_allows_rs(rs, FIREWALL_DIR_CONNECTION, 1)
              ) {
     log_info(LD_BUG, "Selected a directory %s with non-preferred OR and Dir "
-             "addresses for launching a connection: "
+             "addresses for launching an outgoing connection: "
              "IPv4 %s OR %d Dir %d IPv6 %s OR %d Dir %d",
              routerstatus_describe(rs),
              fmt_addr32(rs->addr), rs->or_port,
              rs->dir_port, fmt_addr(&rs->ipv6_addr),
              rs->ipv6_orport, rs->dir_port);
-    log_backtrace(LOG_INFO, LD_BUG, "Node search initiated by");
   }
 }