[or-cvs] r10228: (in tor/trunk: . doc/spec src/common src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-20 13:43:29 -0400 (Sun, 20 May 2007)
New Revision: 10228

Modified:
   tor/trunk/
   tor/trunk/doc/spec/dir-spec.txt
   tor/trunk/src/common/container.h
   tor/trunk/src/common/ht.h
   tor/trunk/src/or/config.c
   tor/trunk/src/or/main.c
   tor/trunk/src/or/or.h
   tor/trunk/src/or/router.c
   tor/trunk/src/or/routerlist.c
Log:



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12993] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/doc/spec/dir-spec.txt
===================================================================

Modified: tor/trunk/src/common/container.h
===================================================================

Modified: tor/trunk/src/common/ht.h
===================================================================

Modified: tor/trunk/src/or/config.c
===================================================================

Modified: tor/trunk/src/or/main.c
===================================================================

Modified: tor/trunk/src/or/or.h
===================================================================

Modified: tor/trunk/src/or/router.c
===================================================================

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-05-20 14:15:23 UTC (rev 10227)
+++ tor/trunk/src/or/routerlist.c	2007-05-20 17:43:29 UTC (rev 10228)
@@ -2026,7 +2026,6 @@
         ei_tmp->cache_info.signed_descriptor_len;
       extrainfo_free(ei_tmp);
     }
-
     if (!tor_digest_is_zero(ri_old->cache_info.extra_info_digest))
       digestmap_remove(rl->desc_by_eid_map,
                        ri_old->cache_info.extra_info_digest);