r17845@catbus: nickm | 2008-01-30 13:32:22 -0500

 Backport: Fix bug 597: stop telling people to email Tor-ops.  Also give a better suggestion when some other identity has been assigned the nickname we are using.


svn:r13338

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c1090a99a..31cc813549 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes in versino 0.1.2.20 - 2008-??-??
+  o Minor bugfixes
+    - Stop recommending that every server operator send mail to tor-ops.
+      Resolves bug 597.
+
 Changes in version 0.1.2.19 - 2008-01-17
   Tor 0.1.2.19 fixes a huge memory leak on exit relays, makes the default
   exit policy a little bit more conservative so it's safer to run an
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 69712519a2..6e4916594e 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3441,9 +3441,7 @@ routers_update_all_from_networkstatus(void)
         have_warned_about_invalid_status = 1;
       } else if (n_naming && !n_named) {
         log_info(LD_GENERAL, "0/%d name-binding directory authorities "
-                 "recognize your nickname. Please consider sending your "
-                 "nickname and identity fingerprint to the tor-ops.",
-                 n_naming);
+                 "recognize your nickname.", n_naming);
         have_warned_about_invalid_status = 1;
       }
     }