Funny. I could have sworn it compiled this morning when I checked it in.

svn:r5239

src/or/config.c

@@ -2807,13 +2807,13 @@ config_cmp_addr_policies(addr_policy_t *a, addr_policy_t *b)
 {
   int r;
   while (a && b) {
-    if (r=((int)a->addr - (int)b->addr))
+    if ((r=((int)a->addr - (int)b->addr)))
       return r;
-    if (r=((int)a->msk - (int)b->msk))
+    if ((r=((int)a->msk - (int)b->msk)))
       return r;
-    if (r=((int)a->prt_min - (int)b->prt_min))
+    if ((r=((int)a->prt_min - (int)b->prt_min)))
       return r;
-    if (r=((int)a->prt_max - (int)b->prt_max))
+    if ((r=((int)a->prt_max - (int)b->prt_max)))
       return r;
     a = a->next;
     b = b->next;

src/or/routerlist.c

@@ -2874,8 +2874,8 @@ router_differences_are_cosmetic(routerinfo_t *r1, routerinfo_t *r2)
       strcasecmp(r1->nickname, r2->nickname) ||
       r1->or_port != r2->or_port ||
       r1->dir_port != r2->dir_port ||
-      crypto_pk_cmp_keys(r1->onion_key, r2->onion_key) ||
-      crypto_pk_cmp_keys(r1->identity_pkey, r2->onion_pkey) ||
+      crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) ||
+      crypto_pk_cmp_keys(r1->identity_pkey, r2->identity_pkey) ||
       strcasecmp(r1->platform, r2->platform) ||
       strcasecmp(r1->contact_info, r2->contact_info) ||
       r1->is_hibernating != r2->is_hibernating ||