[or-cvs] r9135: (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-12-15 16:51:19 -0500 (Fri, 15 Dec 2006)
New Revision: 9135

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/router.c
Log:



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

Modified: tor/trunk/ChangeLog
===================================================================

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