[or-cvs] r8970: Oops; fix bug in last fix. Time to get some coffee. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-11-20 11:07:33 -0500 (Mon, 20 Nov 2006)
New Revision: 8970

Modified:
   tor/trunk/
   tor/trunk/src/or/circuitbuild.c
Log:
 r9577 at Kushana:  nickm | 2006-11-20 11:07:28 -0500
 Oops; fix bug in last fix. Time to get some coffee.



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

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2006-11-20 16:06:09 UTC (rev 8969)
+++ tor/trunk/src/or/circuitbuild.c	2006-11-20 16:07:33 UTC (rev 8970)
@@ -1252,12 +1252,12 @@
                  "to list of all routers.",
                  need_capacity?", fast":"",
                  need_uptime?", stable":"");
-        return choose_good_exit_server_general(dir, 0, 0);//!!!!
+        smartlist_free(preferredexits);
+        smartlist_free(excludedexits);
+        smartlist_free(sl);
+        tor_free(n_supported);
+        return choose_good_exit_server_general(dir, 0, 0);
       }
-      smartlist_free(preferredexits);
-      smartlist_free(excludedexits);
-      smartlist_free(sl);
-      tor_free(n_supported);
       log_notice(LD_CIRC, "All routers are down or won't exit -- choosing a "
                  "doomed exit at random.");
     }