summaryrefslogtreecommitdiff
path: root/src/or/microdesc.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-12 11:21:59 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-12 11:21:59 -0400
commit621e95a4f3e1e896ee41e261f5e0c953fb6101a9 (patch)
tree4554319bb13d26371c28ad738b40eebf9a0ba8ff /src/or/microdesc.c
parent3968e8d14b7f6282963223b0fd4f4ca3afb60c61 (diff)
parentbdff7e3299d78cd2f7aa4a31e5f57c1aeef5ffa1 (diff)
downloadtor-621e95a4f3e1e896ee41e261f5e0c953fb6101a9.tar.gz
tor-621e95a4f3e1e896ee41e261f5e0c953fb6101a9.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/microdesc.c')
-rw-r--r--src/or/microdesc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 717488bded..664e8b74c1 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -449,10 +449,11 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force)
smartlist_add(wrote, md);
}
- finish_writing_to_file(open_file); /*XXX Check me.*/
-
if (cache->cache_content)
tor_munmap_file(cache->cache_content);
+
+ finish_writing_to_file(open_file); /*XXX Check me.*/
+
cache->cache_content = tor_mmap_file(cache->cache_fname);
if (!cache->cache_content && smartlist_len(wrote)) {