[tor-commits] [tor/master] Update the message logged on relays when DirCache is disabled

[nickm at torproject.org]

commit 692efdad0908232bb50d94b1a7cfef7d071962a5
Author: teor <teor at torproject.org>
Date:   Thu Aug 23 19:10:39 2018 +1000

    Update the message logged on relays when DirCache is disabled
    
    Since 0.3.3.5-rc, authorities require DirCache (V2Dir) for the Guard
    flag.
    
    Fixes bug 24312; bugfix on 0.3.3.5-rc.
---
 changes/bug24312        | 4 ++++
 src/app/config/config.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug24312 b/changes/bug24312
new file mode 100644
index 000000000..f049c0e7e
--- /dev/null
+++ b/changes/bug24312
@@ -0,0 +1,4 @@
+  o Minor bugfixes (relays):
+    - Since 0.3.3.5-rc, authorities require DirCache (V2Dir) for the Guard
+      flag. Update the message logged on relays when DirCache is disabled.
+      Fixes bug 24312; bugfix on 0.3.3.5-rc.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 1502754ec..1a43c7fd5 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -4714,7 +4714,7 @@ have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem,
   } else {
     if (total_mem >= DIRCACHE_MIN_MEM_BYTES) {
       *msg = tor_strdup("DirCache is disabled and we are configured as a "
-               "relay. Many client versions will not choose us as a guard. ");
+               "relay. We will not become a Guard.");
     }
   }
   return *msg == NULL ? 0 : -1;