From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 May 2011 00:12:01 +0000 (-0400)
Subject: Fixup whitespace issues from 3122 commit
X-Git-Tag: tor-0.2.3.2-alpha~119^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc44393eb59a1d303314b4b646b4d815f4eadc22;p=thirdparty%2Ftor.git

Fixup whitespace issues from 3122 commit
---

diff --git a/src/or/config.c b/src/or/config.c
index 9c68b6fa59..0997fe2697 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1288,9 +1288,10 @@ options_act(or_options_t *old_options)
     if (revise_trackexithosts)
       addressmap_clear_excluded_trackexithosts(options);
 
-    if (old_options->AutomapHostsOnResolve && !options->AutomapHostsOnResolve) {
-      revise_automap_entries = 1;
-    } else if (options->AutomapHostsOnResolve) {
+    if (!options->AutomapHostsOnResolve) {
+      if (old_options->AutomapHostsOnResolve)
+        revise_automap_entries = 1;
+    } else {
       if (!smartlist_strings_eq(old_options->AutomapHostsSuffixes,
                                 options->AutomapHostsSuffixes))
         revise_automap_entries = 1;
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 517dac5074..96e3df5cec 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2213,7 +2213,8 @@ networkstatus_add_detached_signatures(networkstatus_t *target,
     }
     for (alg = DIGEST_SHA1; alg < N_DIGEST_ALGORITHMS; ++alg) {
       if (!tor_mem_is_zero(digests->d[alg], DIGEST256_LEN)) {
-        if (fast_memeq(target->digests.d[alg], digests->d[alg], DIGEST256_LEN)) {
+        if (fast_memeq(target->digests.d[alg], digests->d[alg],
+                       DIGEST256_LEN)) {
           ++n_matches;
         } else {
           *msg_out = "Mismatched digest.";