[tor-commits] [tor/main] Add spaces between the "and" when logging the "Your server has not managed to confirm reachability for its" on dual-stack relays

[nickm at torproject.org]

commit 8ead53330c73e9bc1b82f6b7fc8946d629063842
Author: Neel Chauhan <neel at neelc.org>
Date:   Thu Aug 26 13:38:48 2021 -0700

    Add spaces between the "and" when logging the "Your server has not managed to confirm reachability for its" on dual-stack relays
---
 changes/bug40453                   | 4 ++++
 src/feature/relay/relay_periodic.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug40453 b/changes/bug40453
new file mode 100644
index 0000000000..28ed13b47a
--- /dev/null
+++ b/changes/bug40453
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging, relay):
+    - Add spaces between the "and" when logging the "Your server has
+      not managed to confirm reachability for its" on dual-stack relays
+      Fixes bug 40453; bugfix on 0.4.5.1-alpha. Patch by Neel Chauhan.
diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c
index ee94590e01..dd9be4e36f 100644
--- a/src/feature/relay/relay_periodic.c
+++ b/src/feature/relay/relay_periodic.c
@@ -219,7 +219,7 @@ reachability_warnings_callback(time_t now, const or_options_t *options)
           tor_asprintf(&where4, "%s:%d", address4, me->ipv4_orport);
         if (!v6_ok)
           tor_asprintf(&where6, "[%s]:%d", address6, me->ipv6_orport);
-        const char *opt_and = (!v4_ok && !v6_ok) ? "and" : "";
+        const char *opt_and = (!v4_ok && !v6_ok) ? " and " : "";
 
         /* IPv4 reachability test worked but not the IPv6. We will _not_
          * publish the descriptor if our IPv6 was configured. We will if it