[or-cvs] r10319: forward-port r10318 (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-05-24 19:39:04 -0400 (Thu, 24 May 2007)
New Revision: 10319

Modified:
   tor/trunk/src/or/circuitbuild.c
Log:
forward-port r10318


Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2007-05-24 23:38:14 UTC (rev 10318)
+++ tor/trunk/src/or/circuitbuild.c	2007-05-24 23:39:04 UTC (rev 10319)
@@ -2347,8 +2347,10 @@
   int need_uptime = state->need_uptime;
   int need_capacity = state->need_capacity;
 
-  smartlist_add(exit_family, chosen_exit);
-  routerlist_add_family(exit_family, chosen_exit);
+  if (chosen_exit) {
+    smartlist_add(exit_family, chosen_exit);
+    routerlist_add_family(exit_family, chosen_exit);
+  }
 
   if (!entry_guards)
     entry_guards = smartlist_create();