Merge remote-tracking branch 'tor-gitlab/mr/591'

master88wi · Jul 21, 2022 · 0bd2065 · 0bd2065
2 parents 1ecd7c5 + 0eb2142
commit 0bd2065
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/changes/log-quotes b/changes/log-quotes
@@ -0,0 +1,3 @@
+  o Minor bugfixes (logging):
+    - Avoid ""double-quoting"" strings in several log messages.
+      Fixes bug 22723; bugfix on 0.1.2.2-alpha.
diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c
@@ -110,7 +110,7 @@ add_rsa_fingerprint_to_dir(const char *fp, authdir_config_t *list,
   tor_strstrip(fingerprint, " ");
   if (base16_decode(d, DIGEST_LEN,
                     fingerprint, strlen(fingerprint)) != DIGEST_LEN) {
-    log_warn(LD_DIRSERV, "Couldn't decode fingerprint \"%s\"",
+    log_warn(LD_DIRSERV, "Couldn't decode fingerprint %s",
              escaped(fp));
     tor_free(fingerprint);
     return -1;

diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c
@@ -768,11 +768,11 @@ dns_resolve_impl,(edge_connection_t *exitconn, int is_resolve,
 
     if (!is_reverse || !is_resolve) {
       if (!is_reverse)
-        log_info(LD_EXIT, "Bad .in-addr.arpa address \"%s\"; sending error.",
+        log_info(LD_EXIT, "Bad .in-addr.arpa address %s; sending error.",
                  escaped_safe_str(exitconn->base_.address));
       else if (!is_resolve)
         log_info(LD_EXIT,
-                 "Attempt to connect to a .in-addr.arpa address \"%s\"; "
+                 "Attempt to connect to a .in-addr.arpa address %s; "
                  "sending error.",
                  escaped_safe_str(exitconn->base_.address));