[tor-commits] [tor/maint-0.3.0] Clarify the message logged when a remote relay is unexpectedly missing a port

[nickm at torproject.org]

commit 518ef61975b569eb604b30c92d965e98373c2673
Author: teor <teor2345 at gmail.com>
Date:   Tue Jan 3 16:56:32 2017 +1100

    Clarify the message logged when a remote relay is unexpectedly missing a port
    
    (Users were confusing this with a local port.)
    
    Fixes bug 20711; bugfix on 0.2.8.2-alpha.
---
 changes/bug20711   | 4 +++-
 src/or/directory.c | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changes/bug20711 b/changes/bug20711
index 01a1ad7..0bc0d94 100644
--- a/changes/bug20711
+++ b/changes/bug20711
@@ -2,4 +2,6 @@
     - Allow relays to use directory mirrors without a DirPort: these relays
       need to be contacted over their ORPorts using a begindir connection.
       Fixes bug 20711; bugfix on 0.2.8.2-alpha.
-
+    - Clarify the message logged when a remote relay is unexpectedly missing
+      an ORPort or DirPort: users were confusing this with a local port.
+      Fixes bug 20711; bugfix on 0.2.8.2-alpha.
diff --git a/src/or/directory.c b/src/or/directory.c
index a39fc3b..38bd5f9 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1245,9 +1245,9 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port,
   if (!port || tor_addr_is_null(&addr)) {
     static int logged_backtrace = 0;
     log_warn(LD_DIR,
-             "Cannot make an outgoing %sconnection without %sPort.",
+             "Cannot make an outgoing %sconnection without a remote %sPort.",
              use_begindir ? "begindir " : "",
-             use_begindir ? "an OR" : "a Dir");
+             use_begindir ? "OR" : "Dir");
     if (!logged_backtrace) {
       log_backtrace(LOG_INFO, LD_BUG, "Address came from");
       logged_backtrace = 1;