summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-15 20:12:01 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-15 20:12:01 -0400
commitbc44393eb59a1d303314b4b646b4d815f4eadc22 (patch)
tree06de3a0c48451915abafb85cce3a8123c7773522
parent4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611 (diff)
downloadtor-bc44393eb59a1d303314b4b646b4d815f4eadc22.tar.gz
tor-bc44393eb59a1d303314b4b646b4d815f4eadc22.zip
Fixup whitespace issues from 3122 commit
-rw-r--r--src/or/config.c7
-rw-r--r--src/or/dirvote.c3
2 files changed, 6 insertions, 4 deletions
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.";