diff --git a/ChangeLog b/ChangeLog
index 3db6081bc7..dfef549a80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ Changes in version 0.1.2.4-alpha - 2006-11-??
       the client sends data.  Previously, the connection would just hang
       until the client sent data. (Patch from tup based on patch from
       Zajcev Evgeny.)
+    - Fix a memory leak when we fail to pick an exit node.
 
   o Minor bugfixes
     - Don't log spurious warnings when we see a circuit close reason we
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 3268d6d3ce..7b414b9bb2 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1252,8 +1252,12 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime,
                  "to list of all routers.",
                  need_capacity?", fast":"",
                  need_uptime?", stable":"");
-        return choose_good_exit_server_general(dir, 0, 0);
+        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.");
     }