When reporting verbose nicknames in entry_guards_getinfo(), avoid

printing a duplicate "$" in the keys we send. (Reported by mwenge)


svn:r8681

2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index add00fa69..520ce08fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@ Changes in version 0.1.2.3-alpha - 2006-10-??
     - Fix handling of verbose nicknames with ORCONN controller events:
       make them show up exactly when requested, rather than exactly when
       not requested.
+    - When reporting verbose nicknames in entry_guards_getinfo(), avoid
+      printing a duplicate "$" in the keys we send.
 
 
 Changes in version 0.1.2.2-alpha - 2006-10-07
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 9a9ca59b1..878c20f25 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2481,9 +2481,9 @@ entry_guards_getinfo(int use_long_names, const char *question, char **answer)
         }
         if (when) {
           format_iso_time(tbuf, when);
-          tor_snprintf(c, len, "$%s %s %s\n", nbuf, status, tbuf);
+          tor_snprintf(c, len, "%s %s %s\n", nbuf, status, tbuf);
         } else {
-          tor_snprintf(c, len, "$%s %s\n", nbuf, status);
+          tor_snprintf(c, len, "%s %s\n", nbuf, status);
         }
         smartlist_add(sl, c);
       });