diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-03 17:19:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-03 17:19:35 -0400 |
| commit | 865d53be5484ef06ca4a5103d9ebca343e19f7d4 (patch) | |
| tree | 6cf1970fedf5f628f04f65c9f6af383af6cf0249 /src/or/microdesc.h | |
| parent | 97a55b80894b2816f435a1ee06a2549f0da72939 (diff) | |
| parent | cb6c909664f97f751fe78c0aa3205a9042760c53 (diff) | |
| download | tor-865d53be5484ef06ca4a5103d9ebca343e19f7d4.tar.gz tor-865d53be5484ef06ca4a5103d9ebca343e19f7d4.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/microdesc.c
Diffstat (limited to 'src/or/microdesc.h')
| -rw-r--r-- | src/or/microdesc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/microdesc.h b/src/or/microdesc.h index d96d34a77c..c967742aa3 100644 --- a/src/or/microdesc.h +++ b/src/or/microdesc.h @@ -23,7 +23,7 @@ smartlist_t *microdescs_add_list_to_cache(microdesc_cache_t *cache, int no_save); void microdesc_cache_clean(microdesc_cache_t *cache, time_t cutoff, int force); -int microdesc_cache_rebuild(microdesc_cache_t *cache); +int microdesc_cache_rebuild(microdesc_cache_t *cache, int force); int microdesc_cache_reload(microdesc_cache_t *cache); void microdesc_cache_clear(microdesc_cache_t *cache); |