diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-15 20:09:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-15 20:09:10 -0400 |
| commit | 4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611 (patch) | |
| tree | d76a05b933fef271e890e27f7933fa4a6668219b /src/or/routerlist.c | |
| parent | d29c2eb9214a82653a18d51e643d637851dcd145 (diff) | |
| parent | 00ff80e0ae3a07ff3e2148d66d59716bc4630096 (diff) | |
| download | tor-4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611.tar.gz tor-4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611.zip | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/networkstatus.c
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c26f00387d..a3d9b78ee7 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2332,8 +2332,8 @@ router_get_by_nickname(const char *nickname, int warn_if_unnamed) if (n_matches <= 1 || router->is_running) best_match = router; } else if (maybedigest && - tor_memeq(digest, router->cache_info.identity_digest, DIGEST_LEN) - ) { + tor_memeq(digest, router->cache_info.identity_digest, + DIGEST_LEN)) { if (router_hex_digest_matches(router, nickname)) return router; /* If we reach this point, we have a ID=name syntax that matches the @@ -5063,8 +5063,9 @@ routerinfo_incompatible_with_extrainfo(routerinfo_t *ri, extrainfo_t *ei, /* The identity must match exactly to have been generated at the same time * by the same router. */ - if (tor_memneq(ri->cache_info.identity_digest, ei->cache_info.identity_digest, - DIGEST_LEN)) { + if (tor_memneq(ri->cache_info.identity_digest, + ei->cache_info.identity_digest, + DIGEST_LEN)) { if (msg) *msg = "Extrainfo nickname or identity did not match routerinfo"; goto err; /* different servers */ } |