diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:36:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:36:40 -0400 |
| commit | acd6a4856bccff92eb241b18066ca7df577ab5f2 (patch) | |
| tree | 153eb944a6f61e3591831b3fde0385ee4e51e5bd /src/or/microdesc.c | |
| parent | e36f9d1d9beec0daed57b68f936293dccc77b171 (diff) | |
| parent | 0b3166fffa0e5e19c63fd95538f87d634444d28c (diff) | |
| download | tor-acd6a4856bccff92eb241b18066ca7df577ab5f2.tar.gz tor-acd6a4856bccff92eb241b18066ca7df577ab5f2.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/connection.c
Diffstat (limited to 'src/or/microdesc.c')
| -rw-r--r-- | src/or/microdesc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 68b89ed341..717488bded 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -487,7 +487,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) cache->journal_len = 0; cache->bytes_dropped = 0; - new_size = (int)cache->cache_content->size; + new_size = cache->cache_content ? (int)cache->cache_content->size : 0; log_info(LD_DIR, "Done rebuilding microdesc cache. " "Saved %d bytes; %d still used.", orig_size-new_size, new_size); |