summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-07-17 06:55:50 +0000
committerRoger Dingledine <arma@torproject.org>2006-07-17 06:55:50 +0000
commit60f345202d37d225fe456344ad0ccb87766db23b (patch)
tree74537a09a3e2b7f3da9f956fb04b85db9a55a340
parent31e11a2cb000e1ae47fad5898492d1e67a63e5da (diff)
downloadtor-60f345202d37d225fe456344ad0ccb87766db23b.tar.gz
tor-60f345202d37d225fe456344ad0ccb87766db23b.zip
minimal backport: remove an assert that might cause trouble one day.
svn:r6776
-rw-r--r--branches/tor-0_1_1-patches/src/or/circuitbuild.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/branches/tor-0_1_1-patches/src/or/circuitbuild.c b/branches/tor-0_1_1-patches/src/or/circuitbuild.c
index 985477304e..1bf16c1ac6 100644
--- a/branches/tor-0_1_1-patches/src/or/circuitbuild.c
+++ b/branches/tor-0_1_1-patches/src/or/circuitbuild.c
@@ -182,7 +182,8 @@ circuit_rep_hist_note_result(circuit_t *circ)
}
if (server_mode(get_options())) {
routerinfo_t *me = router_get_my_routerinfo();
- tor_assert(me);
+ if (!me)
+ return;
prev_digest = me->cache_info.identity_digest;
}
do {