diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-10 23:48:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-10 23:48:59 -0400 |
| commit | 73ee161d8a7bc06eefa58654cbfe421449921eec (patch) | |
| tree | 63180f23fde34ceb2d9deae26c940fb8c4876e51 /src/or | |
| parent | e07206afea28d110a0a7b74d4e230db3b0fe3120 (diff) | |
| parent | 3c2c6a61163cd6a42cc0eeee9fc43200b9f08503 (diff) | |
| download | tor-73ee161d8a7bc06eefa58654cbfe421449921eec.tar.gz tor-73ee161d8a7bc06eefa58654cbfe421449921eec.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/routerlist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 697837e509..a018181026 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4948,7 +4948,7 @@ routerlist_assert_ok(const routerlist_t *rl) } SMARTLIST_FOREACH_END(r); SMARTLIST_FOREACH_BEGIN(rl->old_routers, signed_descriptor_t *, sd) { r2 = rimap_get(rl->identity_map, sd->identity_digest); - tor_assert(sd != &(r2->cache_info)); + tor_assert(!r2 || sd != &(r2->cache_info)); sd2 = sdmap_get(rl->desc_digest_map, sd->signed_descriptor_digest); tor_assert(sd == sd2); tor_assert(sd->routerlist_index == sd_sl_idx); |