From: Roger Dingledine <arma@torproject.org>
Date: Thu, 15 Aug 2019 06:32:00 +0000 (-0400)
Subject: fix typo in keypin journal log entry (for dir auths)
X-Git-Tag: tor-0.4.2.1-alpha~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b1aa9a5726b61bdbdd1b05f27b97cedfa953395;p=thirdparty%2Ftor.git

fix typo in keypin journal log entry (for dir auths)
---

diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c
index 667feb2c03..3ca2c3ef91 100644
--- a/src/feature/dirauth/keypin.c
+++ b/src/feature/dirauth/keypin.c
@@ -438,7 +438,7 @@ keypin_load_journal_impl(const char *data, size_t size)
   tor_log(severity, LD_DIRSERV,
           "Loaded %d entries from keypin journal. "
           "Found %d corrupt lines (ignored), %d duplicates (harmless), "
-          "and %d conflicts (resolved in favor or more recent entry).",
+          "and %d conflicts (resolved in favor of more recent entry).",
           n_entries, n_corrupt_lines, n_duplicates, n_conflicts);
 
   return 0;