diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-05-16 14:49:55 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-05-16 14:49:55 -0400 |
commit | e908e3a332dd469af2facac0846d0dc8349a30d3 (patch) | |
tree | 45195df03a09bc0fde12760ddccc60eaa59e7f72 /src/or/rendcommon.h | |
parent | 919bf6ff3cfb1387f3f9ecf9ce97d8e95e330a05 (diff) | |
parent | 4a22046c86bec7165e6977024ff84e2109832417 (diff) | |
download | tor-e908e3a332dd469af2facac0846d0dc8349a30d3.tar.gz tor-e908e3a332dd469af2facac0846d0dc8349a30d3.zip |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Fixed trivial conflict due to headers moving into their own .h files
from or.h.
Conflicts:
src/or/or.h
Diffstat (limited to 'src/or/rendcommon.h')
-rw-r--r-- | src/or/rendcommon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index 44b5227cf5..c51039f1f2 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -44,7 +44,8 @@ int rend_cache_lookup_desc(const char *query, int version, const char **desc, int rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **entry_out); int rend_cache_lookup_v2_desc_as_dir(const char *query, const char **desc); -int rend_cache_store(const char *desc, size_t desc_len, int published); +int rend_cache_store(const char *desc, size_t desc_len, int published, + const char *service_id); int rend_cache_store_v2_desc_as_client(const char *desc, const rend_data_t *rend_query); int rend_cache_store_v2_desc_as_dir(const char *desc); |