[or-cvs] fix compile error (and likely a a crash bug in resolves)

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	routerlist.c 
Log Message:
fix compile error (and likely a a crash bug in resolves)


Index: routerlist.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- routerlist.c	29 Jun 2005 19:15:23 -0000	1.241
+++ routerlist.c	1 Jul 2005 01:59:37 -0000	1.242
@@ -1052,7 +1052,7 @@
              router->address, router->nickname);
       return -1;
     }
-    memcpy((void *)router->addr, &iaddr.s_addr, 4);
+    memcpy((void *)&router->addr, &iaddr.s_addr, 4);
   } else {
     if (tor_lookup_hostname(router->address, &router->addr) != 0
         || !router->addr) {
@@ -1111,7 +1111,7 @@
  *
  * For now, the algorithm is pretty simple: we look for definite and
  * uncertain matches.  The first definite match is what we guess; if
- * it was proceded by no uncertain matches of the opposite policy,
+ * it was preceded by no uncertain matches of the opposite policy,
  * then the guess is definite; otherwise it is probable.  (If we
  * have a known addr and port, all matches are definite; if we have an
  * unknown addr/port, any address/port ranges other than "all" are