[or-cvs] r13338: Backport: Fix bug 597: stop telling people to email Tor-ops. (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-01-30 13:32:39 -0500 (Wed, 30 Jan 2008)
New Revision: 13338

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/routerlist.c
Log:
 r17845 at 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.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r17845] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2008-01-30 18:32:30 UTC (rev 13337)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2008-01-30 18:32:39 UTC (rev 13338)
@@ -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

Modified: tor/branches/tor-0_1_2-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2008-01-30 18:32:30 UTC (rev 13337)
+++ tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2008-01-30 18:32:39 UTC (rev 13338)
@@ -3441,9 +3441,7 @@
         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;
       }
     }